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=b47152ba735b990e31c6817343f5d4603d5b845c;hb=866b47c0652d8ce6d1bea20442f8ab273b5ba99a;hpb=4b2e8632eba4fa2343986f897cfcd59ed1413d66

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index b47152b..8600154 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -1,6 +1,6 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/hooks/instsoft.GRML
-# Purpose:       grml specific Debian installation in the chroot
+# 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/
 # License:       This file is licensed under the GPL v2 or any later version.
@@ -9,24 +9,43 @@
 set -u
 set -e
 
-# visualize chroot inside zsh:
-echo grml_chroot > $target/etc/debian_chroot
+GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list"
+DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list"
 
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
-[ -n "$HOSTNAME" ] || HOSTNAME=grml
-echo "$HOSTNAME" > $target/etc/hostname
+# if hooks/updatebase.GRMLBASE fails for whatever reason
+# and can't skip instsoft.GRMLBASE we have to make sure
+# we exit here as well
+if [ -n "$BUILD_ONLY" ] ; then
+   "Exiting hooks/instsoft.GRMLBASE as BUILD_ONLY environment is set."
+   exit 0
+fi
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
-   echo "Softupdate of FAI via grml-live running"
+   echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running"
 
    if [ -r /etc/resolv.conf ] ; then
-      if [ -r $target/etc/resolvconf/run/resolv.conf ] ; then
+     if [ -d $target/etc/resolvconf/run ] ; then # 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
+       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
+     elif [ -L $target/etc/resolvconf/run ] ; then # resolvconf with /run
+       # /etc/resolvconf/run symlinks to /run/resolvconf
+       mkdir -p $target/run/resolvconf
+       cat /etc/resolv.conf >> $target/run/resolvconf/resolv.conf
+     else # no resolvconf installed in chroot
+       if ! [ -L $target/etc/resolv.conf ] ; then
          cat /etc/resolv.conf >> $target/etc/resolv.conf
-      fi
+       else
+         echo "Error: /etc/resolv.conf in chroot should not be a symlink (resolvconf not installed)." >&2
+         exit 1
+       fi
+     fi
    fi
 
    if [ -r $target/etc/policy-rc.d.conf ] ; then
@@ -44,37 +63,24 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
 //DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
 EOF
 
-   # make sure we can handle kernel upgrades:
-   if [ -r $target/etc/kernel-img.conf ] ; then
-      if ! grep -q "silent_modules = Yes" $target/etc/kernel-img.conf ; then
-         echo "silent_modules = Yes" >> $target/etc/kernel-img.conf
-      fi
-   fi
-
    # 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
@@ -82,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
@@ -100,53 +114,24 @@ EOF
       APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y upgrade
    fi
 
-else # no softupdate but fresh installation
-
-# install all apt related files
-fcopy -r /etc/apt
-
-# remove grml-live's sources.list file from chroot:
-if [ -r $target/etc/apt/important_note.txt ] ; then
-   grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt
-fi
-
-# install grml gpg key:
-fcopy /etc/apt/grml.key
-$ROOTCMD apt-key add /etc/apt/grml.key
-#   gpg --keyserver subkeys.pgp.net      --recv-keys F61E2E7CECDEA787 || \
-#   gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787
-#   gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
-#   $ROOTCMD apt-key add /etc/apt/grml.key
-
-# make sure the file exists
-[ -e $target/etc/apt/apt.conf ] || touch $target/etc/apt/apt.conf
-
-# work around http://trac.lighttpd.net/trac/ticket/657
-if ! grep -q 'Acquire::http::Pipeline-Depth.*0' $target/etc/apt/apt.conf ; then
-   echo "Acquire::http::Pipeline-Depth 0; // added by grml-live" >> $target/etc/apt/apt.conf
+   exit # make sure we don't continue behind the following "fi"
 fi
 
-# Recommends just pull in way tooooo much packages, so disable it:
-if ! grep -q 'APT::Install-Recommends.*false' $target/etc/apt/apt.conf ; then
-   echo "APT::Install-Recommends false; // added by grml-live"   >> $target/etc/apt/apt.conf
-fi
+# no softupdate but fresh installation
+echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running"
 
-# Notice: deprecated with aptitude (0.4.11-1):
-if ! grep -q 'Aptitude::Recommends-Important.*false' $target/etc/apt/apt.conf ; then
-   echo "Aptitude::Recommends-Important false; // added by grml-live" >> $target/etc/apt/apt.conf
+# 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
 fi
 
-# 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."
-  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
+# 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:
@@ -176,7 +161,5 @@ if [ -L "$target"/usr/sbin/invoke-rc.d ] ; then
    $ROOTCMD dpkg-divert --package fai --rename --remove /usr/sbin/invoke-rc.d
 fi
 
-fi # end of FAI_ACTION = softupdate
-
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2