--- a/buildd/functions.sh Wed Oct 24 09:27:01 2007 +0200
+++ b/buildd/functions.sh Wed Oct 24 10:12:28 2007 +0200
@@ -46,8 +46,8 @@ grml_live_run() {
grml_live_run() {
grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
-g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
- 1>$LOGFILES/grml-live.stdout \
- 2>$LOGFILES/grml-live.stderr ; RC=$?
+ 1>$LOGFILES/grml-buildd.stdout \
+ 2>$LOGFILES/grml-buildd.stderr ; RC=$?
if [ "$RC" = "0" ] ; then
RC_INFO=success
--- a/debian/changelog Wed Oct 24 09:27:01 2007 +0200
+++ b/debian/changelog Wed Oct 24 10:12:28 2007 +0200
@@ -3,7 +3,10 @@ grml-live (0.0.7) unstable; urgency=low
* Reworked buildd concept. Now we have a seperate
/usr/share/grml-live/buildd/functions.sh for generic
stuff and /etc/grml/grml-buildd.conf as configuration
- file.
+ file. Use grml-buildd.{stdout,stderr} instead of
+ grml-live.{stdout,stderr} as log files.
+ * Use version number of grml-live inside script and write
+ it to the logs as well.
* Log executed grml-live command line.
* Set $SECONDS to unknown if $start_seconds is not set.
* Improve directory handling for $LOGFILE.
--- a/grml-live Wed Oct 24 09:27:01 2007 +0200
+++ b/grml-live Wed Oct 24 10:12:28 2007 +0200
@@ -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: Wed Oct 24 09:26:39 CEST 2007 [mika]
+# Latest change: Wed Oct 24 10:11:02 CEST 2007 [mika]
################################################################################
# read configuration files, set some misc variables {{{
@@ -14,6 +14,8 @@ export LC_ALL=C
# exit on any error:
set -e
+
+GRML_LIVE_VERSION='0.0.7'
# we need root permissions for the build-process:
if [ "$(id -u 2>/dev/null)" != 0 ] ; then
@@ -69,7 +71,7 @@ trap bailout 1 2 3 15
[ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
[ -n "$GRML_NAME" ] || GRML_NAME='grml'
-[ -d /var/log/fai/dirinstall/"${HOSTNAME}" ] || mkdir -p /var/log/fai/dirinstall/${HOSTNAME}
+[ -d /var/log/fai/dirinstall/"${HOSTNAME}" ] || mkdir -p /var/log/fai/dirinstall/${HOSTNAME}
if [ -d /var/log/fai/dirinstall/"${HOSTNAME}" ] ; then
LOGFILE=/var/log/fai/dirinstall/${HOSTNAME}/grml-live.log
else
@@ -183,7 +185,8 @@ done
done
shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter
-echo "Executing: $(basename $0) $*" >> $LOGFILE
+echo "Executing grml-live $GRML_LIVE_VERSION using the commandline:" >> $LOGFILE
+echo "$(basename $0) $@" >> $LOGFILE
# }}}
# some misc checks before executing FAI {{{
@@ -196,7 +199,7 @@ specify it on the command line using the
# ask user whether the setup is ok {{{
if [ -z "$FORCE" ] ; then
echo
- echo "${PN}: check your configuration (or use -F to force execution without prompting):"
+ echo "${PN} [${GRML_LIVE_VERSION}]: check your configuration (or use -F to force execution):"
echo
echo " FAI classes: $CLASSES"
echo " main directory: $OUTPUT"