--- a/debian/changelog Sun Nov 25 16:49:09 2007 +0100
+++ b/debian/changelog Sun Nov 25 17:21:06 2007 +0100
@@ -7,6 +7,9 @@ grml-live (0.0.10) unstable; urgency=low
- LOGDIR is now /var/log/fai/$HOSTNAME/$FAI_ACTION_date+time
- LOGDIR is /tmp/fai during an installation (not dirinstall), and
will be copied to the path above at the end of an installation
+ * Log the executed FAI command line to /var/log/grml-live.log.
+ * No longer update chroot system via instsoft.GRMLBASE as FAI
+ should do that now.
* Do not enable apt-listbugs if the binary is not available.
[Testing: issue340]
* Add keychain package to GRML_MEDIUM.
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE Sun Nov 25 16:49:09 2007 +0100
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE Sun Nov 25 17:21:06 2007 +0100
@@ -62,19 +62,6 @@ EOF
fi
cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
fi
-
- # FAI softupdate does not execute upgrade, so let's do it on our own:
-# $ROOTCMD apt-get update
-# if [ -x $target/usr/bin/aptitude ] ; then
-# if strings $target/usr/bin/aptitude | grep safe-upgrade 1>/dev/null ; then
-# $ROOTCMD aptitude -y safe-upgrade
-# else
-# $ROOTCMD aptitude -y upgrade
-# fi
-# else
-# $ROOTCMD apt-get -y upgrade
-# fi
-
else # no softupdate but fresh installation
# work around http://trac.lighttpd.net/trac/ticket/657
--- a/grml-live Sun Nov 25 16:49:09 2007 +0100
+++ b/grml-live Sun Nov 25 17:21:06 2007 +0100
@@ -4,7 +4,7 @@
# 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 25 16:35:35 CET 2007 [mika]
+# Latest change: Sun Nov 25 17:16:07 CET 2007 [mika]
################################################################################
# read configuration files, set some misc variables {{{
@@ -31,6 +31,7 @@ if [ -r /var/run/fai/FAI_INSTALLATION_IN
exit 1
fi
+# see #449236
if [ -r /var/run/fai/fai_softupdate_is_running ] ; then
echo "/usr/sbin/fai softupdate already running or was aborted before.">&2
echo "You may remove /var/run/fai/fai_softupdate_is_running and try again.">&2
@@ -243,7 +244,8 @@ start_seconds=$(cut -d . -f 1 /proc/upti
start_seconds=$(cut -d . -f 1 /proc/uptime)
log "------------------------------------------------------------------------------"
log "Starting grml-live [${GRML_LIVE_VERSION}] run on $(date)"
-log "Executed command line: $CMDLINE"
+log "Executed grml-live command line:"
+log "$CMDLINE"
einfo "Logging actions to logfile $LOGFILE"
# }}}
@@ -324,7 +326,10 @@ else
mkdir -p "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
mount --bind "${MIRROR_DIRECTORY}" "${CHROOT_OUTPUT}/${MIRROR_DIRECTORY}"
fi
+ log "Executed FAI command line:"
+ log "fai $VERBOSE -C $GRML_FAI_CONFIG -c$CLASSES -u $HOSTNAME $FAI_ACTION $CHROOT_OUTPUT $FAI_ARGS"
fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" -u "$HOSTNAME" $FAI_ACTION "$CHROOT_OUTPUT" $FAI_ARGS | tee -a $LOGFILE
+ echo "debug: $?"
log "Setting /etc/grml_version to $GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]"
echo "$GRML_NAME $VERSION Release Codename $RELEASENAME [$ISO_DATE]" > $CHROOT_OUTPUT/etc/grml_version