X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=c7f343cff115a2470166de4341323a6e9ef8d6cf;hp=6cf2c9b30b19f179d7ad96d331cc07809b78f787;hb=c9141f43791a61b6bce79fa3963791f96dd78f04;hpb=ea8df13abc59d9a9bb36ad03e11c3467762443e3

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 6cf2c9b..c7f343c 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/hooks/updatebase.GRMLBASE
+# Filename:      ${GRML_FAI_CONFIG}/hooks/updatebase.GRMLBASE
 # Purpose:       Updates the base packages of the system, prepare chroot for instsoft
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -18,6 +18,12 @@ HOSTNAME=''
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 echo "$HOSTNAME" > $target/etc/hostname
 
+if [ -n "${APT_PROXY:-}" ] ; then
+  cat > $target/etc/apt/apt.conf.d/90grml-apt-proxy.conf <<EOF
+Acquire::http { Proxy "$APT_PROXY"; };
+EOF
+fi
+
 if [ "$FAI_ACTION" = "softupdate" ] ; then
    echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
 
@@ -49,20 +55,25 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    exit # make sure we don't continue behind the following "fi"
 fi
 
-# no softupdate but updating chroot e.g. based on /etc/grml/fai/config/basefiles/*
-echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
+if [ -n "$BOOTSTRAP_ONLY" ] ; then
+  echo "Skipping task configure in hooks/updatebase.GRMLBASE as BOOTSTRAP_ONLY environment is set."
+  skiptask configure
+fi
 
-# install all apt related files
-fcopy -r /etc/apt
+# no softupdate but updating chroot e.g. based on ${GRML_FAI_CONFIG}/basefiles/*
+echo "Action $FAI_ACTION of FAI (hooks/updatebase.GRMLBASE) via grml-live running"
 
-# remove grml-live's notice file from chroot:
-if [ -r $target/etc/apt/important_note.txt ] ; then
-   grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt
+# work around #632624: udev fails to install on systems with old kernel versions
+if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
+  echo "Working around udev package bug, creating /etc/udev/kernel-upgrade"
+  echo "# installed via updatebase.GRMLBASE" > ${target}/etc/udev/kernel-upgrade
 fi
 
-# install grml gpg key:
-fcopy /etc/apt/grml.key
+# install all apt related files
+fcopy -v -r /etc/apt
+
+# install Grml gpg key:
 $ROOTCMD apt-key add /etc/apt/grml.key
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2