X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=e35dcbfb944285c3f680a445a04481561e3c6eb3;hp=640c760bca82dc732c6609bc788d67323c93758e;hb=079ea71204d408f78886da20fe019dd631a3b2bc;hpb=da17773665b471bfee8358395433d58e49568786

diff --git a/grml-live b/grml-live
index 640c760..e35dcbf 100755
--- 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.
-# Latest change: Sun Jan 20 22:30:49 CET 2008 [mika]
+# Latest change: Die Jän 22 11:57:54 CET 2008 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -177,8 +177,18 @@ http://grml.org/bugs/
 }
 # }}}
 
-# command line parsing {{{
+# 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
+# }}}
 
+# command line parsing {{{
 while getopts "a:C:c:g:i:o:r:s:t:v:bFhuVz" opt; do
   case "$opt" in
     a) ARCH="$OPTARG" ;;
@@ -214,22 +224,13 @@ specify it on the command line using the -c option."
 specify 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:
+# clean/zero grml-live logfile {{{
 if [ -n "$ZERO_LOGFILE" ] ; then
    echo -n > $LOGFILE
 fi
+# }}}
 
-# clean/zero/remove old FAI directory:
+# 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)"
@@ -240,7 +241,6 @@ if [ -n "$ZERO_FAI_LOGFILE" ] ; then
             /var/log/fai/"$HOSTNAME"/last-softupdate
    fi
 fi
-
 # }}}
 
 # ask user whether the setup is ok {{{
@@ -547,7 +547,7 @@ else
    [ -f "$CHROOT_OUTPUT/base.tgz" ] && rm -f "$CHROOT_OUTPUT/base.tgz"
 
    # execute squashfs:
-   if mksquashfs --help 2>&1 | grep -- -no-progress ; then
+   if mksquashfs --help 2>&1 | grep -q -- -no-progress ; then
       log "mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress"
       mksquashfs $CHROOT_OUTPUT/* $BUILD_OUTPUT/live/grml.squashfs -noappend -no-progress $SQUASHFS_OPTIONS $SQUASHFS_ZLIB
    else