X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=c229448e5c149269ac988d732c9a99c207fa1139;hp=d50e6002cc30707d33224b792604e9831393b8fe;hb=574c42b5cbb9d1264b84bade255aed42547db8ec;hpb=c8546cb8d8d0870c6993343a7b5cfe27694cbf4e

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index d50e600..c229448 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -7,23 +7,39 @@
 ################################################################################
 
 if [ "$FAI_ACTION" = "softupdate" ] ; then
-   # 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
-#   if ! [ -r $target/usr/sbin/policy-rc.d ] ; then
-#      cat > $target/usr/sbin/policy-rc.d << EOF
-##!/bin/sh
-## FAI_ACTION=updatebase
-#exit 101
-#EOF
-#      chmod 755 $target/usr/sbin/policy-rc.d
-#   fi
+
+   ## 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
+   if ! [ -r $target/usr/sbin/policy-rc.d ] ; then
+      cat > $target/usr/sbin/policy-rc.d << EOF
+#!/bin/sh
+# FAI_ACTION=updatebase
+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 || /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