Update doc, script and etc/grml/fai/live-initramfs/grml-script.init-top

diff --git a/docs/Makefile b/docs/Makefile
index e4b5a95..5dc4b84 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -5,7 +5,7 @@ doc: doc_man doc_html
 doc_html: html-stamp
 
 html-stamp: grml-live.txt
-       asciidoc -b xhtml11 grml-live.txt
+       asciidoc -b xhtml11 -a icons grml-live.txt
        touch html-stamp
 
 doc_man: man-stamp

diff --git a/docs/grml-live.txt b/docs/grml-live.txt
index bd4c41d..6aacc75 100644 (file)
--- a/docs/grml-live.txt
+++ b/docs/grml-live.txt
@@ -229,6 +229,8 @@ as verbose unless you specify it)
 
 * provide possibility for cleanup of all created build directories
 
+* support nocolor-option for /etc/grml/fai/grml/grml_cleanup_chroot
+
 Bugs
 ----
 

diff --git a/etc/grml/fai/live-initramfs/grml-script.init-top b/etc/grml/fai/live-initramfs/grml-script.init-top
index 43942ba..ae29383 100755 (executable)
--- a/etc/grml/fai/live-initramfs/grml-script.init-top
+++ b/etc/grml/fai/live-initramfs/grml-script.init-top
@@ -2,7 +2,9 @@
 
 # helper functions {{{
 
-echo "debug: scripts/init-top/grml running"
+if ! grep -qe debug -qe verbose /proc/cmdline 2>/dev/null ; then
+   echo "debug: scripts/init-top/grml running"
+fi
 
 # get boot command line
 CMDLINE="$(cat /proc/cmdline)"

diff --git a/grml-live b/grml-live
index 78053dc..57b5e10 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -136,8 +136,9 @@ if [ -d "$CHROOT_TARGET" ] ; then
 else
    mkdir "$CHROOT_TARGET" || bailout 5 "Problem with creating $CHROOT_TARGET for FAI"
    fai $VERBOSE -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$CHROOT_TARGET" $FAI_ARGS
-   umount $CHROOT_TARGET/proc 2>/dev/null
-   umount $CHROOT_TARGET/sys  2>/dev/null
+   umount $CHROOT_TARGET/proc 2>/dev/null || /bin/true
+   umount $CHROOT_TARGET/sys  2>/dev/null || /bin/true
+   echo "  [*] Finished execution of stage 'fai dirinstall'"
 fi
 # }}}
 
@@ -172,7 +173,7 @@ if [ "$ARCH" = x86 ] ; then
       # boot.cat
       if [ -n "$WINDOWS_BINARIES" ] ; then
          if [ -d "$BUILD_TARGET"/windows ] ; then
-            echo "  [x] $BUILD_TARGET/windows exists already - skipping stage WINDOWS_BINARIES"
+            echo "  [x] $BUILD_TARGET/windows exists already - skipping stage 'WINDOWS_BINARIES'"
             return 0
          else
             mkdir "$BUILD_TARGET"/windows
@@ -181,7 +182,9 @@ if [ "$ARCH" = x86 ] ; then
                   wget ${WINDOWS_BINARIES}/${file}.exe
               done )
          fi
+      echo "  [*] Finished execution of stage 'WINDOWS_BINARIES'"
       fi
+   echo "  [*] Finished execution of stage 'boot/isolinux'"
    fi
 # amd64:
 elif [ "$ARCH" = amd64 ] ; then
@@ -200,6 +203,7 @@ else
    mkdir "$BUILD_TARGET"/live
    mksquashfs $CHROOT_TARGET/* $BUILD_TARGET/live/grml.squashfs -noappend
 fi
+echo "  [*] Finished execution of stage 'squashfs'"
 # }}}
 
 # ISO_TARGET - mkisofs {{{
@@ -214,7 +218,7 @@ else
              -c boot/isolinux/boot.cat -b boot/isolinux/isolinux.bin      \
              -o "$ISO_TARGET"/grml_0.0-1.iso .
    )
-
+   echo "  [*] Finished execution of stage 'iso build'"
 fi
 # }}}