X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=82a2fb9ab54ac4732d165691dd7d23b2846eba85;hp=b49b180b065f9a16be63928b1e22b2242cec6d89;hb=005cdc1ea39899e025f302f05e16fb93bb66fee9;hpb=1cef31a85e18484353f05dc851ed101001f9c07c

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index b49b180..82a2fb9 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -18,6 +18,12 @@ 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"
 
@@ -64,7 +70,14 @@ if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
 fi
 
 # install all apt related files
-fcopy -r /etc/apt
+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
 
 # install Grml gpg key:
 $ROOTCMD apt-key add /etc/apt/grml.key