X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=3a7b9affc29578893b84e81cb7b80ce91e276bfb;hp=f88f0fb988677163b81ec9833b20041613220929;hb=f4e1966f03cf049bf9f927540a774c38eb31a8bd;hpb=a242e27306035a23c96bf5b07b0840942ed245fb

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index f88f0fb..3a7b9af 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -18,10 +18,16 @@ HOSTNAME=''
 [ -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:
@@ -45,8 +51,6 @@ if [ "$FAI_ACTION" = "softupdate" ] ; then
    if [ -n "$BUILD_ONLY" ] ; then
       skiptask instsoft || true
    fi
-
-   exit # make sure we don't continue behind the following "fi"
 fi
 
 if [ -n "$BOOTSTRAP_ONLY" ] ; then
@@ -54,9 +58,6 @@ if [ -n "$BOOTSTRAP_ONLY" ] ; then
   skiptask configure
 fi
 
-# no softupdate but updating chroot e.g. based on ${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"
@@ -64,14 +65,7 @@ if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
 fi
 
 # install all apt related files
-fcopy -v /etc/apt/grml.key
-fcopy -v /etc/apt/preferences
-fcopy -v /etc/apt/apt.conf.d/20pdiffs
-fcopy -v /etc/apt/apt.conf.d/15grml-live
-
-# this is the auto-generated sources.list file by grml-live,
-# will be overriden by $GRML_FAI_CONFIG/scripts/GRMLBASE/33-aptsetup
-fcopy -v -c GRML_LIVE_SOURCES_LIST /etc/apt/sources.list
+fcopy -B -v -r /etc/apt
 
 # install Grml gpg key:
 $ROOTCMD apt-key add /etc/apt/grml.key