From 125b44302522f6f27bc574d2f9f4e2bccf10f4d2 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Fri, 9 Jul 2010 14:37:00 +0200 Subject: [PATCH 1/1] instsoft.GRMLBASE: warn if apt-get update fails but try to continue Signed-off-by: Michael Prokop --- etc/grml/fai/config/hooks/instsoft.GRMLBASE | 30 ++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE index f1a947b..ec40703 100755 --- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE +++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE @@ -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 -- 2.1.4