X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F98-clean-chroot;h=3667762d9d7b6169bfb49c06aa38598cb972b6ce;hb=5780f4d09448e7045556e03d3b6f4eb2b4d78bb7;hp=a9bb0e068eb3244c52a6cc61fe306d58c70cc81f;hpb=7580b07259ad4d91a3ecb52367a6a460f8cf1237;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index a9bb0e0..3667762 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -21,7 +21,22 @@ if [ -x $target/usr/sbin/localepurge ] ; then
   echo "Running localepurge"
   $ROOTCMD localepurge
 else
-  echo "Warning: localepurg not installed"
+  echo "Warning: localepurge not installed"
+fi
+
+# 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"
@@ -183,7 +198,7 @@ else
 EOF
 fi
 
-if ! [ -x $target/usr/bin/updatedb ] ; then
+if ! $ROOTCMD test -x /usr/bin/updatedb ; then
   echo "Warning: updatedb not installed"
 else
   echo "Updating locate-database"