From: Michael Prokop <mika@grml.org>
Date: Wed, 18 Jan 2012 16:09:28 +0000 (+0100)
Subject: GRMLBASE/98-clean-chroot: do not run apt-get update if RELEASE class is set
X-Git-Tag: v0.18.1~7
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=dde7410511284101d0df1541a0cf55feabbeb61a

GRMLBASE/98-clean-chroot: do not run apt-get update if RELEASE class is set

${GRML_FAI_CONFIG}/config/scripts/RELEASE/98-clean-chroot cleans
up the chroot WRT apt stuff then, so there's no need to run
'apt-get update' inside GRMLBASE/98-clean-chroot if RELEASE class
is set.
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index e435c71..435f129 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@ -41,8 +41,14 @@ if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ;
   $ROOTCMD rm -f /etc/udev/kernel-upgrade
 fi
 
-echo "Updating package list"
-$ROOTCMD apt-get update
+set +u
+if ifclass RELEASE ; then
+set -u
+  echo "Not updating package list as RELEASE class is set."
+else
+  echo "Updating package list"
+  $ROOTCMD apt-get update
+fi
 
 echo "Cleaning apt places"
 $ROOTCMD apt-get check 2>/dev/null