X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=2734ae2e7ba0a9b8689d1ec9940ce3a1b1342a6b;hb=f50966ae5939137aa7887a2c46753419d71f6ca6;hp=16d4a6f32d559fb65af61d0ed3ac2a402bf2c4a8;hpb=848aacd341724969418da66ab72948a3d0bb42f2;p=grml-live.git

diff --git a/grml-live b/grml-live
index 16d4a6f..2734ae2 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: Mon Sep 17 00:21:49 CEST 2007 [mika]
+# Latest change: Tue Sep 18 09:11:50 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,GRML_X,I386 -t /grml/
+    $PN -c GRMLBASE,I386 -t /dev/shm/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
@@ -106,10 +107,10 @@ specify it on the command line using the -t|--target option."
 # ask user whether the setup is ok {{{
 if [ -z "$FORCE" ] ; then
    echo
-   echo "$PN - check your configuration (or invoke using -F to force execution without prompting)"
+   echo "$PN - check your configuration (or invoke using -F to force execution without prompting):"
    echo
    echo "  FAI classes:       $CLASSES"
-   echo "  output directory:  $TARGET"
+   echo "  main directory:    $TARGET"
    [ -n "$CHROOT_TARGET" ] && echo "  chroot target:     $CHROOT_TARGET"
    [ -n "$BUILD_TARGET" ]  && echo "  build target:      $BUILD_TARGET"
    [ -n "$ISO_TARGET" ]    && echo "  ISO target:        $ISO_TARGET"
@@ -151,11 +152,18 @@ fi
 if [ -d "$CHROOT_TARGET" ] ; then
    echo "  [x] $CHROOT_TARGET exists already, skipping the stage 'fai dirnstall'"
 else
-   mkdir "$CHROOT_TARGET" || bailout 5 "Problem with creating $CHROOT_TARGET for FAI"
+   mkdir -p "$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 || /bin/true
    umount $CHROOT_TARGET/sys  2>/dev/null || /bin/true
-   echo "  [*] Finished execution of stage 'fai dirinstall'"
+   # notice: 'fai dirinstall' does not seem to exit appropriate ->
+   # we need better error handling
+   if [ -r "$CHROOT_TARGET"/etc/grml_cd ] ; then
+      echo "  [*] Finished execution of stage 'fai dirinstall'"
+   else
+      echo "  [!] There was an error during execution of stage 'fai dirinstall'"
+      exit 1
+   fi
 fi
 # }}}
 
@@ -251,4 +259,4 @@ bailout 0
 # }}}
 
 ## END OF FILE #################################################################
-# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=2
+# vim:foldmethod=marker ts=2 ft=sh ai expandtab tw=80 sw=3