Merge remote-tracking branch 'origin/github/pr/145'

[grml-live.git] / etc / grml / fai / config / hooks / instsoft.GRMLBASE

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 51a0e77..2c4a880 100755 (executable)
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -20,33 +20,10 @@ fi
 if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running"
 
-   if [ -r /etc/resolv.conf ] ; then
-     case "$(chroot $target readlink -f /etc/resolv.conf)" in
-       /run/*) # resolvconf with /run
-         mkdir -p $target/run/resolvconf
-         cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
-         ;;
-       /lib/*) # resolvconf without /run
-         # sanity check to avoid "input file is output file",
-         # see http://bts.grml.org/grml/issue984
-         if ! [ -L $target/etc/resolvconf/run/resolv.conf ] ; then
-           cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
-         else
-           echo "Error: /etc/resolvconf/run/resolv.conf in chroot should not be a symlink." >&2
-           echo "       Looks like something is wrong, please fix manually." >&2
-           exit 1
-         fi
-         ;;
-       *) # no resolvconf
-         if ! [ -L $target/etc/resolv.conf ] ; then
-           cat /etc/resolv.conf >> $target/etc/resolv.conf
-         else
-           echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
-           exit 1
-         fi
-         ;;
-     esac
-   fi
+   # /etc/resolv.conf is usually a symlink, pointing out of the chroot.
+   # Make it a file with known contents.
+   rm -f "${target}"/etc/resolv.conf
+   cat /etc/resolv.conf >> "$target"/etc/resolv.conf
 
    if [ -r $target/etc/policy-rc.d.conf ] ; then
       sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf
@@ -71,12 +48,29 @@ EOF
      $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
+   # work around a bug which causes openvz to freeze when grub-probe is invoked
+   if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/grub-probe' ; then
+     echo "Diverting grub-probe executable"
+     $ROOTCMD dpkg-divert --rename --add /usr/sbin/grub-probe
+     $ROOTCMD ln -s /bin/true /usr/sbin/grub-probe
+   fi
+
+   # Update package lists (so they exist at all), so we can install
+   # software; if /var/lib/dpkg/available is empty, it was was probably
+   # cleaned by GRMLBASE/98-clean-chroot, so we need to rebuild it
+   # anyway
+   $ROOTCMD /usr/lib/dpkg/methods/apt/update /var/lib/dpkg/ apt apt
 
    if ! $ROOTCMD test -x /usr/bin/aptitude ; then
-      $ROOTCMD apt-get -y install aptitude
+     # 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
+     if ! $ROOTCMD apt-get update ; then
+       echo "Warning: there was an error executing apt-get update, continuing anyway."
+       echo "Warning: there was an error executing apt-get update, continuing anyway." >&2
+     fi
+
+     $ROOTCMD apt-get -y install aptitude
    fi
 
    # make sure we can upgrade automatically,
@@ -86,6 +80,10 @@ EOF
      APTITUDE_OPTS="${APTITUDE_OPTS:-} --allow-untrusted"
    fi
 
+   # make sure we don't fail when configuration files changed
+   APTGET_OPTS="${APTGET_OPTS:-} -o DPkg::Options::=--force-confdef -o DPkg::Options::=--force-confmiss -o DPkg::Options::=--force-confnew"
+   APTITUDE_OPTS="${APTITUDE_OPTS:-} -o DPkg::Options::=--force-confdef -o DPkg::Options::=--force-confmiss -o DPkg::Options::=--force-confnew"
+
    if $ROOTCMD test -x /usr/bin/aptitude ; then
       if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
          APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y $APTITUDE_OPTS safe-upgrade
@@ -102,25 +100,23 @@ fi
 # no softupdate but fresh installation
 echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running"
 
-# make sure we have file-rc available before package_config/GRML* is being executed {{{
-# 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
-if ! $ROOTCMD apt-get update ; then
-   echo "Warning: there was an error executing apt-get update, continuing anyway."
-   echo "Warning: there was an error executing apt-get update, continuing anyway." >&2
+# 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 via:
-$ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc
-# }}}
-
-# get rid of insserv:
-if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then
-   $ROOTCMD apt-get -y --purge remove insserv
+# work around a bug which causes openvz to freeze when grub-probe is invoked
+if ! $ROOTCMD dpkg-divert --list | grep -q '/usr/sbin/grub-probe' ; then
+  echo "Diverting grub-probe executable"
+  $ROOTCMD dpkg-divert --rename --add /usr/sbin/grub-probe
+  $ROOTCMD ln -s /bin/true /usr/sbin/grub-probe
 fi
 
+# }}}
+
 # we definitely don't want to fail running fai dirinstall just
 # because of some well known bugs:
 [ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d