X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=2734ae2e7ba0a9b8689d1ec9940ce3a1b1342a6b;hb=f50966ae5939137aa7887a2c46753419d71f6ca6;hp=98bf5587b942e718ebdd775c132a4f3c6bcc50e6;hpb=85faacc881efc871120f0500b1d1bb2b7216f168;p=grml-live.git diff --git a/grml-live b/grml-live index 98bf558..2734ae2 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # 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 18:31:35 CEST 2007 [mika] +# Latest change: Tue Sep 18 09:11:50 CEST 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -61,8 +61,8 @@ Usage: $PN [-c ] [-t ] [-s [-Fvh] Usage examples: $PN - $PN -c GRMLBASE,I386 -t /dev/shm/grml $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 @@ -107,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" @@ -152,7 +152,7 @@ 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