Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!
| author | Michael Prokop |
| Wed Jan 30 23:38:03 2008 +0100 (10 months ago) | |
| changeset 468 | e1f28a1acff9 |
| manifest | e1f28a1acff9 |
| parent 467 | b7709b8a9924 |
| parent 465 | da92bf8caf93 |
| child 469 | 80adcf54a27c |
--- a/debian/changelog Wed Jan 30 23:37:45 2008 +0100+++ b/debian/changelog Wed Jan 30 23:38:03 2008 +0100@@ -21,6 +21,8 @@ grml-live (0.1) unstable; urgency=low* Bump version number to 0.1 as we ship grml-live with theupcoming stable versions.+ * Source /etc/grml/grml-live.local before parsing command line+ options to be able to override configuration on the commandline.* Use /usr/bin/vim.tiny as alternativ for vi.* Add new packages to GRML_FULL:- at76-usb-modules-2.6.23-grml64
--- a/grml-live Wed Jan 30 23:37:45 2008 +0100+++ b/grml-live Wed Jan 30 23:38:03 2008 +0100@@ -4,10 +4,10 @@# 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 Jan 20 22:38:18 CET 2008 [mika]+# Latest change: Die Jän 22 11:57:54 CET 2008 [mika]################################################################################-# main initialization setup, set some misc variables {{{+# read configuration files, set some misc variables {{{export LANG=Cexport LC_ALL=C@@ -186,27 +186,9 @@ elselog "No $LOCAL_CONFIG found, not sourcing it"LOCAL_CONFIG=''fi--# clean/zero grml-live logfile:-if [ -n "$ZERO_LOGFILE" ] ; then- echo -n > $LOGFILE-fi--# clean/zero/remove old FAI directory:-if [ -n "$ZERO_FAI_LOGFILE" ] ; then- if [ -d /var/log/fai/"$HOSTNAME" ] ; then- rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last)"- rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-dirinstall)"- rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-softupdate)"- rm -f /var/log/fai/"$HOSTNAME"/last \- /var/log/fai/"$HOSTNAME"/last-dirinstall \- /var/log/fai/"$HOSTNAME"/last-softupdate- fi-fi# }}}# command line parsing {{{-while getopts "a:C:c:g:i:o:r:s:t:v:bFhuVz" opt; docase "$opt" ina) ARCH="$OPTARG" ;;@@ -240,6 +222,25 @@ specify it on the command line using thespecify it on the command line using the -c option."[ -n "$OUTPUT" ] || bailout 1 "Error: \$OUTPUT unset, please set it in $LIVE_CONF orspecify it on the command line using the -o option."+# }}}++# clean/zero grml-live logfile {{{+if [ -n "$ZERO_LOGFILE" ] ; then+ echo -n > $LOGFILE+fi+# }}}++# clean/zero/remove old FAI directory {{{+if [ -n "$ZERO_FAI_LOGFILE" ] ; then+ if [ -d /var/log/fai/"$HOSTNAME" ] ; then+ rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last)"+ rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-dirinstall)"+ rm -rf /var/log/fai/"$HOSTNAME"/"$(readlink /var/log/fai/"$HOSTNAME"/last-softupdate)"+ rm -f /var/log/fai/"$HOSTNAME"/last \+ /var/log/fai/"$HOSTNAME"/last-dirinstall \+ /var/log/fai/"$HOSTNAME"/last-softupdate+ fi+fi# }}}# ask user whether the setup is ok {{{