X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=8600154a62e8f614ddc569ef3eec53d414a3f89a;hp=c7873344e7fe3244e90cf35c5d298dbda0e394e7;hb=866b47c0652d8ce6d1bea20442f8ab273b5ba99a;hpb=6c00c3c1fd1e3fee0d10c1f1b4f6257d21d663d9

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index c787334..8600154 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/hooks/instsoft.GRMLBASE
+# Filename:      ${GRML_FAI_CONFIG}/hooks/instsoft.GRMLBASE
 # Purpose:       Grml specific software installation in the chroot, executed after updatebase
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -9,6 +9,9 @@
 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
@@ -62,28 +65,22 @@ EOF
 
    # FAI softupdate executes upgrade only with the sources.list being
    # present in the chroot - so let's do it on our own:
-   if [ -r /etc/grml/fai/apt/sources.list ] ; then
-      if [ -L $target/etc/apt/sources.list ] ; then
-         rm $target/etc/apt/sources.list
-      fi
-
-      # install grml-live's (on the fly adjusted) sources.list config
-      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list
+   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
 
-      # 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  $target/etc/apt/sources.list.d/grml.list ] ; then
-         mv $target/etc/apt/sources.list.d/grml.list $target/etc/apt/sources.list.d/grml.unused
-      fi
-      if [ -r  $target/etc/apt/sources.list.d/debian.list ] ; then
-         mv $target/etc/apt/sources.list.d/debian.list $target/etc/apt/sources.list.d/debian.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 /etc/grml/fai/config/hooks/updatebase.GRMLBASE
+   # see ${GRML_FAI_CONFIG}/hooks/updatebase.GRMLBASE
    # the apt-get update might return an error if there's for example
    # a hashsum mismatch on Debian mirror sources, we might want to continue
    # but should warn the user
@@ -91,6 +88,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