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
2ecba76
..
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
@@
-20,7
+23,7
@@
fi
VERBOSE=''
FORCE=''
VERBOSE=''
FORCE=''
-DEBUG=''
+DEBUG=''
# TODO / FIXME - not implemented yet
# source main configuration file:
. /etc/grml/grml-live.conf
# source main configuration file:
. /etc/grml/grml-live.conf
@@
-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"
@@
-121,8
+124,16
@@
if [ -z "$FORCE" ] ; then
fi
# }}}
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 {{{
# 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 #################################################################
# }}}
## END OF FILE #################################################################