X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=67b339f03a90ffc514789c46f8557a2e698cffbc;hb=1e4a57b1978dcc7ae5506e016920f8d8c3d8070d;hp=d402757a2dd70b575df1b32ef04bee8650d67949;hpb=6decb9b013be4c016fa61afbf86655c8b7afc734;p=grml-live.git

diff --git a/grml-live b/grml-live
index d402757..67b339f 100755
--- a/grml-live
+++ b/grml-live
@@ -91,19 +91,6 @@ fi
 touch $LOGFILE
 chown root:adm $LOGFILE
 chmod 640 $LOGFILE
-# 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)"
-   fi
-fi
 
 NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf
 
@@ -232,6 +219,24 @@ 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 {{{
@@ -573,7 +578,7 @@ else
               -o "${ISO_OUTPUT}/${ISO_NAME}" . ; RC=$?
 
       # generate md5sum of ISO if we are using class 'RELEASE':
-      case $CLASSES in *RELEASES*)
+      case $CLASSES in *RELEASE*)
          [ "$RC" = 0 ] && \
          ( cd $ISO_OUTPUT && \
          md5sum ${ISO_NAME} > ${ISO_NAME}.md5 && \