$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
-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
$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
# 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