X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=5dc3433589c5b4a409003eb4f190490e5b6e7998;hp=d0a09f72ba00a527e3fe3bd2dc07c6079f7989de;hb=7bbfd24bb59bead0491ff8cb5ab7fa8fe6dee619;hpb=e97a5d7afe24d326bae906fe1637e2f0cfd09065

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index d0a09f7..5dc3433 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -1,6 +1,6 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/hooks/instsoft.GRML
-# Purpose:       grml specific Debian installation in the chroot
+#!/bin/bash
+# Filename:      /etc/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,17 +9,8 @@
 set -u
 set -e
 
-# visualize chroot inside zsh:
-echo grml_chroot > $target/etc/debian_chroot
-
-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 [ "$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
@@ -44,85 +35,80 @@ 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:
+   # 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
-      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
+
+      # 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
+
+      # 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
    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
-   $ROOTCMD apt-get update
+   # 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
+
    if ! [ -x $target/usr/bin/aptitude ] ; then
       $ROOTCMD apt-get -y install aptitude
    fi
 
    if [ -x $target/usr/bin/aptitude ] ; then
       if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
-         $ROOTCMD aptitude -y safe-upgrade
+         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y safe-upgrade
       else
-         $ROOTCMD aptitude -y upgrade
+         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y upgrade
       fi
    else
-      $ROOTCMD apt-get -y upgrade
+      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
-if [ -r /etc/grml/fai/files/etc/apt ] ; then
-   cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/
+   exit # make sure we don't continue behind the following "fi"
 fi
 
-# install all present (but at least the grml) gpg keys:
-if [ -r /etc/grml/fai/files/etc/apt/grml.key ] ; then
-   for file in /etc/grml/fai/files/etc/apt/*.key ; do
-      FILE="$(basename $file)"
-      # installed via 'cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/' above already
-      # cp $file $target/etc/apt/"$FILE"
-      $ROOTCMD apt-key add /etc/apt/"$FILE"
-   done
-else
-   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
-fi
+# no softupdate but fresh installation
+echo "Action $FAI_ACTION of FAI (hooks/instsoft.GRMLBASE) via grml-live running"
 
-# 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
+# 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
 
-# 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
+# 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
+# }}}
 
-# 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
+# get rid of insserv:
+if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then
+   $ROOTCMD apt-get -y --purge remove insserv
 fi
 
-# make sure we have file-rc available before
-# package_config/GRML is being executed:
-$ROOTCMD apt-get update
-$ROOTCMD aptitude -f -y install file-rc
-
-# Workaround #443481 of snort for Debian/etch:
-mkdir -p $target/etc/snort
-echo 'LOGDIR=/var/log/snort' >> $target/etc/snort/snort.common.parameters
-
 # 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
@@ -145,7 +131,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