X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=cef16c01fc191163a428a6e17f18c4a029ce0b38;hb=38068281cf1adbc2218085592f5f884be6a1f564;hp=61872602e41dabf94ae9ae8eec0f1b2241821aa9;hpb=8efad5c2d113d02caea9de491a267f068b52f8f2;p=grml-live.git

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 6187260..cef16c0 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/hooks/updatebase.GRMLBASE
 # Purpose:       skip task updatebase of FAI when running softupdate
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -7,10 +7,21 @@
 ################################################################################
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
-   # we want to use our own sources.list:
+
+   ## we want to use our own sources.list:
    skiptask updatebase
-   # make sure we don't start any daemons - removed
-   # later on via /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+
+   ## taken from FAI's lib/updatebase:
+   # some packages must access /proc even in chroot environment
+   mount -t proc proc $FAI_ROOT/proc
+   # some packages must access /sys even in chroot environment
+   mount -t sysfs sysfs $FAI_ROOT/sys
+   # if we are using udev, also mount it into $FAI_ROOT
+   [ -f /etc/init.d/udev ] && mount --bind /dev $FAI_ROOT/dev
+   mount -t devpts devpts $FAI_ROOT/dev/pts
+
+   ## make sure we don't start any daemons - removed
+   ## later on via /etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
    if ! [ -r $target/usr/sbin/policy-rc.d ] ; then
       cat > $target/usr/sbin/policy-rc.d << EOF
 #!/bin/sh
@@ -19,9 +30,25 @@ exit 101
 EOF
       chmod 755 $target/usr/sbin/policy-rc.d
    fi
+
    # skip the task if we want to build a new ISO only:
-   [ -n "$BUILD_ONLY" ] && skiptask instsoft
+   [ -n "$BUILD_ONLY" ] && skiptask instsoft || /bin/true
+
+else # no softupdate but updating chroot based on /etc/grml/fai/config/basefiles/*
+
+# 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
 
+# install grml gpg key:
+fcopy /etc/apt/grml.key
+$ROOTCMD apt-key add /etc/apt/grml.key
+
+fi # softupdate check
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3