Rework apt.conf handling in instsoft/updatebase (provide /etc/apt/apt.conf.d/15grml...

[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 cef16c0..b063b50 100755 (executable)
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -1,12 +1,25 @@
 #!/bin/bash
 # Filename:      /etc/grml/fai/config/hooks/updatebase.GRMLBASE
 #!/bin/bash
 # Filename:      /etc/grml/fai/config/hooks/updatebase.GRMLBASE

-# Purpose:       skip task updatebase of FAI when running softupdate
+# 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/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 

+set -u
+set -e
+
+# 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 [ "$FAI_ACTION" = "softupdate" ] ; then
 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:
    skiptask updatebase
 
    ## we want to use our own sources.list:
    skiptask updatebase


@@ -34,7 +47,11 @@ EOF
    # skip the task if we want to build a new ISO only:
    [ -n "$BUILD_ONLY" ] && skiptask instsoft || /bin/true
 
    # 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/*
+   exit # make sure we don't continue behind the following "fi"
+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"

 
 # install all apt related files
 fcopy -r /etc/apt
 
 # install all apt related files
 fcopy -r /etc/apt


@@ -48,7 +65,5 @@ fi
 fcopy /etc/apt/grml.key
 $ROOTCMD apt-key add /etc/apt/grml.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
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3