X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml-live;h=9ee1220969d341933f89f6b21a32f35a94055804;hb=f14ac640c983fb7552976b3b89652ed7da59559e;hp=2ecba76b2e9089322411ad5919d937920729e42a;hpb=cfd32a33aab0d28608bba9e34c65b2a1967be9b7;p=grml-live.git

diff --git a/grml-live b/grml-live
index 2ecba76..9ee1220 100755
--- a/grml-live
+++ b/grml-live
@@ -9,6 +9,9 @@
 
 # read configuration files, set some misc variables {{{
 
+export LANG=C
+export LC_ALL=C
+
 # exit on any error:
 set -e
 
@@ -20,7 +23,7 @@ fi
 
 VERBOSE=''
 FORCE=''
-DEBUG=''
+DEBUG='' # TODO / FIXME - not implemented yet
 
 # source main configuration file:
 . /etc/grml/grml-live.conf
@@ -40,7 +43,7 @@ trap bailout 1 2 3 15
 # }}}
 
 # check for important variables {{{
-[ -n "$FAI_CONFIG" ] || FAI_CONFIG=/etc/grml/fai
+[ -n "$GRML_FAI_CONFIG" ] || GRML_FAI_CONFIG=/etc/grml/fai
 [ -n "$HOSTNAME" ] || HOSTNAME=grml
 [ -n "$USERNAME" ] || USERNAME=grml
 [ -n "$CLASSES" ] || CLASSES="GRML"
@@ -121,8 +124,16 @@ if [ -z "$FORCE" ] ; then
 fi
 # }}}
 
+if [ -n "$GRML_LIVE_SOURCES" ] ; then
+   echo "$GRML_LIVE_SOURCES" > /etc/grml/fai/apt/sources.list
+fi
+
+if [ -n "$FAI_DEBOOTSTRAP" ] ; then
+   sed -i "s#^FAI_DEBOOTSTRAP#FAI_DEBOOTSTRAP=$FAI_DEBOOTSTRAP#" /etc/grml/fai/make-fai-nfsroot.conf
+fi
+
 # execute FAI {{{
-echo fai -v -C "$FAI_CONFIG" -c"$CLASSES" dirinstall "$TARGET" $FAI_ARGS
+fai -v -C "$GRML_FAI_CONFIG" -c"$CLASSES" dirinstall "$TARGET" $FAI_ARGS
 # }}}
 
 ## END OF FILE #################################################################