X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=fcc2bdb00029135e5c8b3354fc688b3b75ec6c11;hb=4a05b54fec18a572de88ccf028fb1b5a1121ca0c;hp=473d8bcbeb829c61f09ffdf4391f9ed465fd22c7;hpb=f3b335ea5c94d5cf24ec6b9184106b298849f311;p=grml-live.git

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 473d8bc..fcc2bdb 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -9,9 +9,6 @@
 set -u
 set -e
 
-GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list"
-DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list"
-
 # if hooks/updatebase.GRMLBASE fails for whatever reason
 # and can't skip instsoft.GRMLBASE we have to make sure
 # we exit here as well
@@ -63,22 +60,6 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
 //DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
 EOF
 
-   # FAI softupdate executes upgrade only with the sources.list being
-   # present in the chroot - so let's do it on our own:
-   fcopy /etc/apt/sources.list
-
-   # when re-running grml-live with the -u option we do not want to use the
-   # sources.list config of the live system but grml-live's config instead,
-   # therefore temporarly move known files and restore them again later on
-   # through /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup:
-   if [ -r "$GRML_SOURCES_LIST" ] ; then
-      mv "$GRML_SOURCES_LIST" "${GRML_SOURCES_LIST}.unused"
-   fi
-
-   if [ -r "$DEBIAN_SOURCES_LIST" ] ; then
-      mv "$DEBIAN_SOURCES_LIST" "${DEBIAN_SOURCES_LIST}.unused"
-   fi
-
    # run it on our own, as updatebase is used at the wrong stage for our needs,
    # see ${GRML_FAI_CONFIG}/hooks/updatebase.GRMLBASE
    # the apt-get update might return an error if there's for example
@@ -88,6 +69,14 @@ EOF
       echo "Warning: there was an error executing apt-get update, continuing anyway."
    fi
 
+   # 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 "Diverting update-grub executable"
+     $ROOTCMD dpkg-divert --rename --add /usr/sbin/update-grub
+     $ROOTCMD ln -s /bin/true /usr/sbin/update-grub
+   fi
+
   # newer aptitude versions won't remove essential packages using
   # 'aptitude -f -y install file-rc' anymore, therefore force it:
   $ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc