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

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 6cf2c9b..063cae4 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/
@@ -8,20 +8,23 @@
 
 set -u
 set -e
+. "$GRML_LIVE_CONFIG"
 
 # visualize chroot inside zsh:
 echo grml_chroot > $target/etc/debian_chroot
 
-HOSTNAME=''
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
-[ -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"
 
-   ## we want to use our own sources.list:
+   # otherwise we're running 'aptitude update' even on with -b option
    skiptask updatebase
 
    ## based on FAI's lib/updatebase:
@@ -38,6 +41,11 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
       mount --bind /dev $FAI_ROOT/dev || true
    fi
 
+   if [ -d $FAI_ROOT/run ] ; then
+      mount -t tmpfs tmpfs $FAI_ROOT/run
+      mkdir $FAI_ROOT/run/lock
+   fi
+
    mount -t devpts devpts $FAI_ROOT/dev/pts || true
 
    # skip the task if we want to build a new ISO only,
@@ -45,24 +53,30 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    if [ -n "$BUILD_ONLY" ] ; then
       skiptask instsoft || true
    fi
+fi
 
-   exit # make sure we don't continue behind the following "fi"
+if [ -n "$BOOTSTRAP_ONLY" ] ; then
+  echo "Skipping task configure in hooks/updatebase.GRMLBASE as BOOTSTRAP_ONLY environment is set."
+  skiptask configure
 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"
+# 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
-
-# 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
-fi
+fcopy -i -B -v -r /etc/apt
 
-# install grml gpg key:
-fcopy /etc/apt/grml.key
+# install Grml gpg key:
 $ROOTCMD apt-key add /etc/apt/grml.key
 
+if ! $ROOTCMD test -x /usr/bin/aptitude ; then
+  echo "aptitude binary is not available, installing to make sure further FAI actions continue to work"
+  $ROOTCMD apt-get update
+  $ROOTCMD apt-get -y install aptitude
+fi
+
 ## 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