X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=294b749f2d244f944b59c1323bfd74ea40f0f27e;hp=20a1cb02d681bb5017404d5d36c7a97cfb7c4af9;hb=aadfa9e6736484c002413f02de93057b9a814449;hpb=f7fc84f60c591f0c37ec57004c709e05f43dcbba

diff --git a/chroot-script b/chroot-script
index 20a1cb0..294b749 100755
--- a/chroot-script
+++ b/chroot-script
@@ -6,8 +6,6 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
-set -e # exit on any error
-
 . /etc/debootstrap/config    || exit 1
 . /etc/debootstrap/variables || exit 1
 
@@ -55,31 +53,36 @@ askpass() {
 
 # define chroot mirror {{{
 chrootmirror() {
-  [ -n "$KEEP_SRC_LIST" ] && return
-  [ -z "$COMPONENTS" ]    && COMPONENTS='main contrib non-free'
+  if [ -n "$KEEP_SRC_LIST" ] ; then
+    echo "KEEP_SRC_LIST has been set, skipping chrootmirror stage."
+    return
+  fi
+
+  if [ -z "$COMPONENTS" ] ; then
+    COMPONENTS='main contrib non-free'
+  fi
+  echo "Using repository components $COMPONENTS"
 
   if [ -n "$ISO" ] ; then
-     echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
-     [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
-     # add security.debian.org:
-     case "$RELEASE" in
-       unstable|sid) ;;  # no security pool available
-       *)
-         echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
-         ;;
-     esac
+    echo "Adjusting sources.list for ISO (${ISO})."
+    echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
+    echo "Adding mirror entry (${MIRROR}) to sources.list."
+    [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
   else
     if [ -n "$MIRROR" ] ; then
-       echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
-       # add security.debian.org:
-       case "$RELEASE" in
-         unstable|sid) ;;  # no security pool available
-         *)
-           echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
-           ;;
-       esac
+      echo "Adjusting sources.list for mirror (${MIRROR})."
+      echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
     fi
   fi
+
+  # add security.debian.org:
+  case "$RELEASE" in
+    unstable|sid) ;;  # no security pool available
+    *)
+      echo "Adding security.debian.org to sources.list."
+      echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
+      ;;
+  esac
 }
 # }}}
 
@@ -179,7 +182,7 @@ packages() {
 
   if [ "$PACKAGES" = 'yes' ] ; then
      if ! [ -r /etc/debootstrap/packages ] ; then
-       echo "Error: /etc/debootstrap/packages not found, exiting."
+       echo "Error: /etc/debootstrap/packages (inside chroot) not found, exiting." >&2
        exit 1
      else
        $APTUPDATE
@@ -226,7 +229,7 @@ kernel() {
 reconfigure() {
   if [ -n "$RECONFIGURE" ] ; then
      for package in $RECONFIGURE ; do
-         if dpkg --list $package >/dev/null 2>&1 | grep '^ii' ; then
+         if dpkg --list $package >/dev/null 2>&1 | grep -q '^ii' ; then
            DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \
            echo "Warning: $package does not exist, can not reconfigure it."
          fi