projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
templates/GRML/README.txt: update to match current development
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
75b1b6e
..
49df530
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-12,6
+12,9
@@
export LANG=C
export LC_ALL=C
export LANG=C
export LC_ALL=C
+# avoid leaking into chroots
+unset TMPDIR
+
# define function getfilesize before "set -e"
if stat --help >/dev/null 2>&1; then
getfilesize='stat -c %s' # GNU stat
# define function getfilesize before "set -e"
if stat --help >/dev/null 2>&1; then
getfilesize='stat -c %s' # GNU stat
@@
-464,7
+467,8
@@
if [ -z "$FORCE" ] ; then
read a
if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
CLEAN_ARTIFACTS=0
read a
if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
CLEAN_ARTIFACTS=0
- bailout 1 "Exiting as requested."
+ echo "Exiting as requested."
+ exit 0
fi
echo
fi
fi
echo
fi
@@
-613,7
+617,7
@@
fi
# generate nfsroot configuration for FAI on the fly
if [ -z "$FAI_DEBOOTSTRAP" ] ; then
# generate nfsroot configuration for FAI on the fly
if [ -z "$FAI_DEBOOTSTRAP" ] ; then
- FAI_DEBOOTSTRAP="$SUITE http://
cdn
.debian.net/debian"
+ FAI_DEBOOTSTRAP="$SUITE http://
http
.debian.net/debian"
fi
if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then
fi
if [ -z "$FAI_DEBOOTSTRAP_OPTS" ] ; then