$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
$target/etc/*group- $target/var/spool/postfix/maildrop/* \
$target/etc/*.old $target/etc/*.original \
$target/etc/lvm/.cache $target/etc/lvm/cache/.cache \
- $target/etc/lvm/backup/main $target/tmp/* \
+ $target/etc/lvm/backup/* $target/tmp/* \
$target/var/tmp/* $target/var/backups/* \
- $target/var/lib/mysql $target/var/log/lilo_log.* $target/core*
+ $target/var/lib/mysql $target/var/log/lilo_log.* $target/core* \
+ $target/etc/blkid.tab
# remove only "temporary" or saved files in the given directories
nuke(){
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
$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