* Copy /etc/resolv.conf to chroot in
/etc/grml/fai/config/scripts/GRMLBASE/96-apt-listbugs and
/etc/grml/fai/config/hooks/instsoft.GRMLBASE as well.
+ * Remove /var/run/fai/fai_softupdate_is_running and
+ /var/run/fai/FAI_INSTALLATION_IN_PROGRESS if we exit grml-live.
+ (FAI's softupdate currently does not clean up when canceling
+ the process.)
-- Michael Prokop <mika@grml.org> Sun, 04 Nov 2007 01:43:06 +0100
# 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.
-# Latest change: Sun Nov 04 11:01:20 CET 2007 [mika]
+# Latest change: Sun Nov 04 11:08:53 CET 2007 [mika]
################################################################################
set -u
echo "Softupdate of FAI via grml-live running"
if [ -r /etc/resolv.conf ] ; then
- cat /etc/resolv.conf >> $target/etc/resolv.conf
- fi
+ if [ -r /etc/resolvconf/run/resolv.conf ] ; then
+ cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
+ else
+ cat /etc/resolv.conf >> $target/etc/resolv.conf
+ fi
+ fi
# make sure we prefer grml repository:
if [ -r /etc/grml/fai/apt/preferences ] ; then
# 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.
-# Latest change: Sun Nov 04 01:42:58 CET 2007 [mika]
+# Latest change: Sun Nov 04 11:08:40 CET 2007 [mika]
################################################################################
set -e
[ -n "$HOSTNAME" ] || HOSTNAME=grml
if [ -r /etc/resolv.conf ] ; then
- cat /etc/resolv.conf >> $target/etc/resolv.conf
+ if [ -r /etc/resolvconf/run/resolv.conf ] ; then
+ cat /etc/resolv.conf >> $target/etc/resolvconf/run/resolv.conf
+ else
+ cat /etc/resolv.conf >> $target/etc/resolv.conf
+ fi
fi
if [ -x $target/usr/sbin/apt-listbugs -a -x $target/usr/bin/apt-show-source ] && \
# clean exit {{{
bailout() {
[ -n "$MIRROR_DIRECTORY" ] && umount "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
+ rm -f /var/run/fai/fai_softupdate_is_running /var/run/fai/FAI_INSTALLATION_IN_PROGRESS
[ -n "$1" ] && EXIT="$1" || EXIT="1"
[ -n "$2" ] && eerror "$2">&2
log "------------------------------------------------------------------------------"