projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use GRML_FAI_CONFIG instead of FAI_CONFIGDIRl
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
efaea44
..
9ee1220
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-9,6
+9,9
@@
# read configuration files, set some misc variables {{{
# read configuration files, set some misc variables {{{
+export LANG=C
+export LC_ALL=C
+
# exit on any error:
set -e
# exit on any error:
set -e
@@
-40,7
+43,7
@@
trap bailout 1 2 3 15
# }}}
# check for important variables {{{
# }}}
# 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"
[ -n "$HOSTNAME" ] || HOSTNAME=grml
[ -n "$USERNAME" ] || USERNAME=grml
[ -n "$CLASSES" ] || CLASSES="GRML"
@@
-122,7
+125,7
@@
fi
# }}}
if [ -n "$GRML_LIVE_SOURCES" ] ; then
# }}}
if [ -n "$GRML_LIVE_SOURCES" ] ; then
- echo
$GRML_LIVE_SOURCES
> /etc/grml/fai/apt/sources.list
+ echo
"$GRML_LIVE_SOURCES"
> /etc/grml/fai/apt/sources.list
fi
if [ -n "$FAI_DEBOOTSTRAP" ] ; then
fi
if [ -n "$FAI_DEBOOTSTRAP" ] ; then
@@
-130,7
+133,7
@@
if [ -n "$FAI_DEBOOTSTRAP" ] ; then
fi
# execute FAI {{{
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 #################################################################
# }}}
## END OF FILE #################################################################