echo "Warning: localepurg not installed"
fi
-# find /var -name \*.pid
-echo "Removing pid-files"
-find $target/var/run -name \*.pid -exec rm {} \;
+# revert dpkg-divert of hooks/instsoft.GRMLBASE, which is
+# used to work around /etc/kernel/postinst.d/zz-update-grub failing
+# inside openvz environment, see #597084
+if $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/update-grub' ; then
+ echo "Undoing dpkg-divert of update-grub executable"
+ $ROOTCMD rm -f /usr/sbin/update-grub
+ $ROOTCMD dpkg-divert --rename --remove /usr/sbin/update-grub
+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 "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
rm -f $target/var/lib/apt/lists/*Packages \
rm -rf --one-file-system $target/etc/sysconfig/* \
$target/etc/motd.dpkg-* $target/etc/auto.master.*dpkg* \
$target/etc/samba/*.SID $target/etc/samba/*.tdb \
- $target/var/run $target/var/log/ksymoops/* $target/var/lock/* \
+ $target/var/log/ksymoops/* \
$target/var/state/* $target/var/log/nessus/* \
$target/halt $target/reboot $target/ash.static \
$target/etc/dhcpc/*.info $target/etc/dhcpc/resolv* \
$ROOTCMD ldconfig
fi
-if [ -x $target/usr/bin/update-menus ] ; then
+if ! [ -x $target/usr/bin/update-menus ] ; then
echo "Warning: update-menus not installed"
else
echo "Updating windowmanager menus"
echo "Warning: clamav[-freshclam] not installed"
else
echo "Cleaning /var/lib/clamav/"
- rm -f $target/var/lib/clamav/clamav-*
+ $ROOTCMD rm -rf /var/lib/clamav/clamav-*
echo "Setting up daily.cvd and main.cvd symlinks"
if [ -f $target/var/lib/clamav/daily.cvd ] ; then