X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=3bbd19a64ae4524f13f07896ce714f9052617992;hp=32f15b263c467f36549482e4320ec6899b3039cc;hb=837ac5728ed1ab1d05f162b68b798bca6fe16ce4;hpb=c96402b843bc4300a45155066a4c379928bf9c5f

diff --git a/chroot-script b/chroot-script
index 32f15b2..3bbd19a 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
 
@@ -61,25 +59,19 @@ chrootmirror() {
   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
   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
     fi
   fi
+
+  # 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
 }
 # }}}