projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create /usr/share/grml-live/buildd in debian/rules
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
a1939cd
..
a9ecab0
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-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.
# 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:
Thu Oct 18 00:18:07
CEST 2007 [mika]
+# Latest change:
Sat Oct 20 12:12:23
CEST 2007 [mika]
################################################################################
# read configuration files, set some misc variables {{{
################################################################################
# read configuration files, set some misc variables {{{
@@
-69,8
+69,11
@@
trap bailout 1 2 3 15
[ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
[ -n "$GRML_NAME" ] || GRML_NAME='grml'
[ -n "$RELEASENAME" ] || RELEASENAME="grml-live rocks"
[ -n "$GRML_NAME" ] || GRML_NAME='grml'
-[ -n "$LOGDIR" ] || LOGDIR="/var/log/"
-LOGFILE="$LOGDIR/grml-live.log"
+if mkdir -p /var/log/fai/dirinstall/${HOSTNAME} ; then
+ LOGFILE=/var/log/fai/dirinstall/${HOSTNAME}/grml-live.log
+else
+ LOGFILE="$LOGDIR/grml-live.log"
+fi
NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf
NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf
@@
-216,10
+219,12
@@
if [ -z "$FORCE" ] ; then
fi
echo
fi
echo
- start_seconds=$(cut -d . -f 1 /proc/uptime)
- log "------------------------------------------------------------------------------"
- log "Starting grml-live run [$(date)]"
fi
fi
+
+start_seconds=$(cut -d . -f 1 /proc/uptime)
+log "------------------------------------------------------------------------------"
+log "Starting grml-live run [$(date)]"
+log "Executed command line: $0 $*"
# }}}
# on-the-fly configuration {{{
# }}}
# on-the-fly configuration {{{
@@
-449,7
+454,7
@@
fi
# }}}
# finalize {{{
# }}}
# finalize {{{
-[ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]"
+[ -n "$start_seconds" ] && SECONDS="$[$(cut -d . -f 1 /proc/uptime)-$start_seconds]"
|| SECONDS="unknown"
einfo "Sucessfully finished execution of $PN [running ${SECONDS} seconds]" ; eend 0
log "Sucessfully finished execution of $PN [running ${SECONDS} seconds]"
log "------------------------------------------------------------------------------"
einfo "Sucessfully finished execution of $PN [running ${SECONDS} seconds]" ; eend 0
log "Sucessfully finished execution of $PN [running ${SECONDS} seconds]"
log "------------------------------------------------------------------------------"