Make sure apt caches are up2date before trying to install aptitude

[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 3a7b9af..063cae4 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -8,14 +8,11 @@
 
 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
@@ -44,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,
@@ -65,10 +67,16 @@ if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
 fi
 
 # install all apt related files
-fcopy -B -v -r /etc/apt
+fcopy -i -B -v -r /etc/apt
 
 # 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=2