Notice: the grml team is migrating from Mercurial to Git.
Please visit git.grml.org instead!
| author | Michael Prokop |
| Sun Jan 20 22:39:25 2008 +0100 (10 months ago) | |
| changeset 462 | 6d546745a85c |
| manifest | 6d546745a85c |
| parent 461 | dbc3f3b42e8c |
| child 463 | 2a52fa6a6581 |
--- a/debian/changelog Sun Jan 20 22:31:01 2008 +0100+++ b/debian/changelog Sun Jan 20 22:39:25 2008 +0100@@ -5,6 +5,8 @@ grml-live (0.2) unstable; urgency=low* Set 'confirm=1' in /etc/apt/listchanges.conf.* Add /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtilsfor providing default /etc/default/loadcpufreq configuration.+ * Move sourcing /etc/grml/grml-live.local *before* the cmdline+ option parsing so we can override already set defaults interative.-- Michael Prokop <mika@grml.org> Mon, 14 Jan 2008 22:54:10 +0100
--- a/grml-live Sun Jan 20 22:31:01 2008 +0100+++ b/grml-live Sun Jan 20 22:39:25 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:30:49 CET 2008 [mika]+# Latest change: Sun Jan 20 22:38:18 CET 2008 [mika]################################################################################-# read configuration files, set some misc variables {{{+# main initialization setup, set some misc variables {{{export LANG=Cexport LC_ALL=C@@ -175,6 +175,34 @@ http://grml.org/bugs/http://grml.org/bugs/"}+# }}}++# read local (non-packaged) configuration {{{+LOCAL_CONFIG=/etc/grml/grml-live.local+if [ -r "$LOCAL_CONFIG" ] ; then+ log "Sourcing $LOCAL_CONFIG"+ . $LOCAL_CONFIG+else+ log "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 {{{@@ -212,35 +240,6 @@ 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."-# }}}--# read local (non-packaged) configuration {{{-LOCAL_CONFIG=/etc/grml/grml-live.local-if [ -r "$LOCAL_CONFIG" ] ; then- log "Sourcing $LOCAL_CONFIG"- . $LOCAL_CONFIG-else- log "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-# }}}# ask user whether the setup is ok {{{