GRMLBASE/98-clean-chroot: execute resolvconf workarounds also for systemd

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 98-clean-chroot

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index 8b3a8bf..88cba00 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -200,10 +200,18 @@ else
 #     DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 EOF
   fi
 #     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
   echo "Warning: updatedb not installed"
 else
 if ! $ROOTCMD test -x /usr/bin/updatedb ; then
   echo "Warning: updatedb not installed"
 else


@@ -211,5 +219,10 @@ else
   $ROOTCMD updatedb --prunepaths='/tmp /usr/tmp /var/tmp /grml /root /proc /sys'
 fi
 
   $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
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2