From: Michael Prokop <mika@grml.org>
Date: Wed, 10 Aug 2011 13:01:13 +0000 (+0200)
Subject: chroot-script: de-duplicate code WRT security mirror.
X-Git-Tag: v0.48~21
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=837ac5728ed1ab1d05f162b68b798bca6fe16ce4

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

diff --git a/chroot-script b/chroot-script
index 7206de9..3bbd19a 100755
--- a/chroot-script
+++ b/chroot-script
@@ -59,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
 }
 # }}}