X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=1d18dd3ed58cc9b8c75f86b8b61b5744830e74e8;hp=19464a2dd8c93200484d5f16fa8e93c2bf389e0a;hb=462afb6bf4b12814e77ebd618a03200cb77eb95f;hpb=c92e94e88fb89eefe6806a278a5b4c43f5ab08d4

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 19464a2..1d18dd3 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -49,15 +49,6 @@ if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ;
   $ROOTCMD rm -f /etc/udev/kernel-upgrade
 fi
 
-set +u
-if ifclass RELEASE ; then
-set -u
-  echo "Not updating package list as RELEASE class is set."
-else
-  echo "Updating package list"
-  $ROOTCMD apt-get update
-fi
-
 echo "Cleaning apt places"
 $ROOTCMD apt-get check 2>/dev/null
 $ROOTCMD dpkg --clear-avail
@@ -209,10 +200,18 @@ else
 #     DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 EOF
   fi
+  rm -f ${target}/etc/resolvconf/resolv.conf.d/original
   rm -f ${target}/etc/resolv.conf
   $ROOTCMD ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf
 fi
 
+# make sure we don't leak any mdadm configurations
+# that are present on the build system to the live system
+if [ -f "${target}/etc/mdadm/mdadm.conf" ] ; then
+  echo "Found /etc/mdadm/mdadm.conf, getting rid of any possible enabled ARRAY settings."
+  sed -i '/^ARRAY/d' "${target}/etc/mdadm/mdadm.conf"
+fi
+
 if ! $ROOTCMD test -x /usr/bin/updatedb ; then
   echo "Warning: updatedb not installed"
 else