From: grml User <repos@grml.org.invalid>
Date: Sat, 15 Sep 2007 17:03:09 +0000 (+0200)
Subject: Use GRML_FAI_CONFIG instead of FAI_CONFIGDIRl
X-Git-Tag: 0.0.1~64
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=f14ac640c983fb7552976b3b89652ed7da59559e

Use GRML_FAI_CONFIG instead of FAI_CONFIGDIRl
---

diff --git a/etc/grml/grml-live.conf b/etc/grml/grml-live.conf
index feae0fa..a69f5e0 100644
--- a/etc/grml/grml-live.conf
+++ b/etc/grml/grml-live.conf
@@ -18,8 +18,8 @@ TARGET="/dev/shm/fai" # FIXME / TODO
 # which FAI classes do you want to use by default?
 CLASSES="GRML"
 
-# directory of configuration files for FAI:
-FAI_CONFIG=/etc/grml/fai
+# directory of configuration files for grml-live's FAI:
+GRML_FAI_CONFIG=/etc/grml/fai
 
 # specify hostname of the live-system:
 HOSTNAME=grml
diff --git a/grml-live b/grml-live
index 94c9c03..9ee1220 100755
--- a/grml-live
+++ b/grml-live
@@ -43,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"
@@ -133,7 +133,7 @@ if [ -n "$FAI_DEBOOTSTRAP" ] ; then
 fi
 
 # execute FAI {{{
-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 #################################################################