chroot-script: de-duplicate code WRT security mirror.

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 470a111..3bbd19a 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -6,8 +6,6 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
 # 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
 
 . /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
   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
   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
     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

 }
 # }}}
 
 }
 # }}}
 


@@ -226,9 +218,10 @@ kernel() {
 reconfigure() {
   if [ -n "$RECONFIGURE" ] ; then
      for package in $RECONFIGURE ; do
 reconfigure() {
   if [ -n "$RECONFIGURE" ] ; then
      for package in $RECONFIGURE ; do

-         dpkg --list $package 1>/dev/null 2>/dev/null && \
-         DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \
-         echo "Warning: $package does not exist, can not reconfigure it."
+         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

      done
   fi
 }
      done
   fi
 }