X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=8220e91a067f3224eceb4e816e96ef40dbcf8ac7;hp=7d15c6099ee2d9982d3124ce93cbef80557fa282;hb=605d6e3967d18f9a4e99b90e6ee1947f4a5ab1c5;hpb=378a83a4fd8f90042eb31bc8cb2e7df9cd7de7b9 diff --git a/grml-live b/grml-live index 7d15c60..8220e91 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: 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 {{{ @@ -131,7 +131,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 +153,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'"