X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=2e78bf740b9ddc7148b708eefd7333f259e40a5f;hp=e435c719b41ff81bf9b84fdd4a45441b510b5ad0;hb=c55319302f73803fb32033335e647c60f65204f9;hpb=d08e5220bdb647ace920fa78170d18829061cb59

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index e435c71..2e78bf7 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -35,15 +35,20 @@ if $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then
   $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-grub
 fi
 
+# revert dpkg-divert of hooks/instsoft.GRMLBASE, which is
+# used to work around a grub-probe<->openvz bug
+if $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/grub-probe' ; then
+  echo "Undoing dpkg-divert of grub-probe executable"
+  $ROOTCMD rm -f /usr/sbin/grub-probe
+  $ROOTCMD dpkg-divert --rename --remove /usr/sbin/grub-probe
+fi
+
 # revert udev workaround of hooks/updatebase.GRMLBASE
 if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ; then
   echo "Removing /etc/udev/kernel-upgrade created by updatebase.GRMLBASE"
   $ROOTCMD rm -f /etc/udev/kernel-upgrade
 fi
 
-echo "Updating package list"
-$ROOTCMD apt-get update
-
 echo "Cleaning apt places"
 $ROOTCMD apt-get check 2>/dev/null
 $ROOTCMD dpkg --clear-avail
@@ -94,14 +99,6 @@ rm -rf --one-file-system $target/etc/sysconfig/* \
        $target/var/lib/mysql $target/var/log/lilo_log.* $target/core* \
        $target/etc/blkid.tab
 
-# avoid data leakage into target system
-if ! [ -f "$target/etc/mtab" ]; then
-  echo "/etc/mtab does not exist or is not a regular file, not touching."
-else
-  echo "Removing /etc/mtab"
-  rm -f "$target/etc/mtab"
-fi
-
 # remove only "temporary" or saved files in the given directories
 nuke(){
   for i in $(find "$@" -name \*.gz -o -name \*.bz2 -o -name \*.0 2>/dev/null); do
@@ -189,22 +186,34 @@ fi
 if ! [ -d $target/etc/resolvconf ] ; then
   echo "Warning: resolvconf not installed"
 else
-  echo "Setting up resolvconf"
-  if [ ! -L $target/etc/resolvconf/run ] ; then # resolvconf without symlink?!
-    RESOLV_CONF=/etc/resolvconf/run
-    rm -rf   ${target}/${RESOLV_CONF}
-    mkdir -p ${target}/${RESOLV_CONF}
-
-    touch ${target}/${RESOLV_CONF}/enable-updates
-    mkdir ${target}/${RESOLV_CONF}/interface
-
-    cat > ${target}/${RESOLV_CONF}/resolv.conf << EOF
+  if ! ifclass FILE_RC ; then
+    echo "Skipping resolvconf workaround because FILE_RC class not in use."
+  else
+    echo "Setting up resolvconf"
+    if [ ! -L $target/etc/resolvconf/run ] ; then # resolvconf without symlink?!
+      RESOLV_CONF=/etc/resolvconf/run
+      rm -rf   ${target}/${RESOLV_CONF}
+      mkdir -p ${target}/${RESOLV_CONF}
+
+      touch ${target}/${RESOLV_CONF}/enable-updates
+      mkdir ${target}/${RESOLV_CONF}/interface
+
+      cat > ${target}/${RESOLV_CONF}/resolv.conf << EOF
 # Dynamic resolv.conf(5) file for glibc resolver(3) generated by resolvconf(8)
 #     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
-  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
@@ -214,5 +223,10 @@ else
   $ROOTCMD updatedb --prunepaths='/tmp /usr/tmp /var/tmp /grml /root /proc /sys'
 fi
 
+if [ -r "${target}/etc/machine-id" ] ; then
+  echo "Removing /etc/machine-id generated by systemd"
+  rm -f "$target/etc/machine-id"
+fi
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2