$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/lvm/.cache $target/etc/lvm/cache/.cache \
$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(){
# 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