Fix usage of $USERNAME in 20-sudo + 21-usersetup

[grml-live.git] / grml-live

diff --git a/grml-live b/grml-live
index 16d4a6f..d3f7cd4 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -61,9 +61,10 @@ Usage: $PN [-c <classe[s]>] [-t <target_directory>] [-s <suite> [-Fvh]
 Usage examples:
 
     $PN
-    $PN -c GRML,I386 -t /dev/shm/grml
-    $PN -c GRML,GRML_X,I386 -t /grml/
-    $PN -s sid -c GRML,I386
+    $PN -c GRMLBASE,I386 -t /dev/shm/grml
+    $PN -c GRMLBASE,GRML_X,I386 -t /grml/
+    $PN -c GRMLBASE,GRML_SMALL,I386
+    $PN -s sid -c GRMLBASE,I386
 
 More details: man grml-live
               /usr/share/doc/grml-live/grml-live.html
@@ -153,6 +154,8 @@ 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
+   # notice: 'fai dirinstall' does not seem to exit appropriate -> we need
+   # better error handling
    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'"