do not fail with empty $APT_PROXY

[grml-live.git] / etc / grml / fai / config / hooks / updatebase.GRMLBASE

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 52a3eee..930ecbd 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -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"
 
@@ -57,8 +63,21 @@ fi
 # 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"
 
+# 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 all apt related files
-fcopy -r /etc/apt
+fcopy -v /etc/apt/grml.key
+fcopy -v /etc/apt/preferences
+fcopy -v /etc/apt/apt.conf.d/20pdiffs
+fcopy -v /etc/apt/apt.conf.d/15grml-live
+
+# this is the auto-generated sources.list file by grml-live,
+# will be overriden by $GRML_FAI_CONFIG/scripts/GRMLBASE/33-aptsetup
+fcopy -v -c GRML_LIVE_SOURCES_LIST /etc/apt/sources.list
 
 # install Grml gpg key:
 $ROOTCMD apt-key add /etc/apt/grml.key