X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=b47152ba735b990e31c6817343f5d4603d5b845c;hp=f1a947b4412f062308fee793a038649fa5927e23;hb=4b2e8632eba4fa2343986f897cfcd59ed1413d66;hpb=71d1b1de4a148424e952884095813fba6098b458

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index f1a947b..b47152b 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/hooks/instsoft.GRML
 # Purpose:       grml specific Debian installation in the chroot
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -75,7 +75,17 @@ EOF
 
    # 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
@@ -126,12 +136,18 @@ if ! grep -q 'Aptitude::Recommends-Important.*false' $target/etc/apt/apt.conf ;
    echo "Aptitude::Recommends-Important false; // added by grml-live" >> $target/etc/apt/apt.conf
 fi
 
-# make sure we have file-rc available before
-# package_config/GRML is being executed:
-$ROOTCMD apt-get update
-# 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
+# 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
+# }}}
 
 # get rid of insserv:
 if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then