From: Michael Prokop <mika@grml.org>
Date: Sat, 26 Nov 2011 16:46:59 +0000 (+0100)
Subject: instsoft.GRMLBASE: do not run explicit apt-get update any longer
X-Git-Tag: v0.17.0~38
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=7d3ca651729de1f6e236e98653b6a1312017e072

instsoft.GRMLBASE: do not run explicit apt-get update any longer
---

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 9d37e12..4b36e51 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -60,15 +60,6 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
 //DPkg::Tools::Options::/usr/sbin/apt-listbugs::Version "2";
 EOF
 
-   # run it on our own, as updatebase is used at the wrong stage for our needs,
-   # 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
-   if ! $ROOTCMD apt-get update ; then
-      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