X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=d3f7cd4913bc27e050f123b714b7357fdfcb1cf7;hp=7d15c6099ee2d9982d3124ce93cbef80557fa282;hb=688558e0caad63c7d2b7053ff7522d4901568342;hpb=378a83a4fd8f90042eb31bc8cb2e7df9cd7de7b9

diff --git a/grml-live b/grml-live
index 7d15c60..d3f7cd4 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 Sep 16 23:53:24 CEST 2007 [mika]
+# Latest change: Mon Sep 17 00:21:49 CEST 2007 [mika]
 ################################################################################
 
 # read configuration files, set some misc variables {{{
@@ -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
@@ -131,7 +132,8 @@ if [ -n "$GRML_LIVE_SOURCES" ] ; then
    echo "$GRML_LIVE_SOURCES" > /etc/grml/fai/apt/sources.list
 fi
 
-# we assume that it is set to 'etch' by default
+# this heuristic is broken as it works exactly *once* by default :-/
+# TODO / FIXME
 if [ -n "$SUITE" ] ; then
    sed -i "s#etch #$SUITE #"   /etc/grml/fai/make-fai-nfsroot.conf
    sed -i "s#etch #$SUITE #"   /etc/grml/grml-live.conf
@@ -152,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'"