From: Evgeni Golov <evgeni@grml.org>
Date: Fri, 3 Aug 2012 08:17:25 +0000 (+0200)
Subject: remove local (file://) mirrors from sources.list
X-Git-Tag: v0.55~8
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=9c1ec11b57c83bfc7b31e2a7148fc39514f46c44;hp=10690a93c8cfddf92ee4d6ab17015b293b0e3709

remove local (file://) mirrors from sources.list

When bootrapping from an ISO or a local mirror, these are bind-mounted
into the chroot. After the bootstraping process, there is nothing
that would bind-mount them again, leaving useless entries in the
chroot's sources.list.
---

diff --git a/chroot-script b/chroot-script
index 98e7b14..6e1a049 100755
--- a/chroot-script
+++ b/chroot-script
@@ -97,6 +97,27 @@ chrootmirror() {
 }
 # }}}
 
+# remove local chroot mirror {{{
+remove_chrootmirror() {
+  if [ -n "$KEEP_SRC_LIST" ] ; then
+    echo "KEEP_SRC_LIST has been set, skipping remove_chrootmirror stage."
+    return
+  fi
+
+  if [ -n "$ISO" ] ; then
+    echo "Removing ISO (${ISO}) from sources.list."
+    TMP_ISO=$(echo "$ISO" |sed 's#/#\\/#g')
+    sed -i "/deb $TMP_ISO $RELEASE $COMPONENTS/ D" /etc/apt/sources.list
+  else
+    if [ -n "$MIRROR" -a -n "$(echo $MIRROR|grep file:)" ] ; then
+      echo "Removing local mirror (${MIRROR}) from sources.list."
+      TMP_MIRROR=$(echo "$MIRROR" |sed 's#/#\\/#g')
+      sed -i "/deb $TMP_MIRROR $RELEASE $COMPONENTS/ D" /etc/apt/sources.list
+    fi
+  fi
+}
+# }}}
+
 # set up grml repository {{{
 grmlrepos() {
   if [ -n "$GRMLREPOS" ] ; then
@@ -532,7 +553,8 @@ trap signal_handler HUP INT QUIT TERM
  for i in chrootmirror grmlrepos kernelimg_conf \
      kernel packages extrapackages  reconfigure hosts interfaces \
      timezone fstab hostname initrd grub_install passwords        \
-     custom_scripts upgrade_system remove_apt_cache services ; do
+     custom_scripts upgrade_system remove_apt_cache services \
+     remove_chrootmirror; do
      if stage $i ; then
        $i && stage $i done || exit 1
      fi