HOSTNAME=''
[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
+[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
[ -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:
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
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"
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