projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SW: add clonezilla to GRML_FULL
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
ef840f6
..
a6dcafb
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
@@
-144,7
+147,13
@@
fi
# source main configuration file:
LIVE_CONF=/etc/grml/grml-live.conf
# source main configuration file:
LIVE_CONF=/etc/grml/grml-live.conf
-. $LIVE_CONF
+if ! [ -r "$LIVE_CONF" ] ; then
+ ewarn "Configuration file $LIVE_CONF can not be read, ignoring"
+else
+ einfo "Sourcing configuration file $LIVE_CONF"
+ . $LIVE_CONF
+ eend $?
+fi
# }}}
# umount all directories {{{
# }}}
# umount all directories {{{
@@
-330,10
+339,15
@@
while getopts "a:C:c:d:D:e:g:i:I:o:r:s:t:U:v:AbBFhnNqQuVz" opt; do
U) CHOWN_USER="$OPTARG" ;;
V) VERBOSE="-v" ;;
z) SQUASHFS_ZLIB=1 ;;
U) CHOWN_USER="$OPTARG" ;;
V) VERBOSE="-v" ;;
z) SQUASHFS_ZLIB=1 ;;
- ?) echo "invalid option -$OPTARG" >&2; bailout 1 ;;
+ ?) echo "invalid option -$OPTARG" >&2;
usage;
bailout 1 ;;
esac
done
shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter
esac
done
shift $(($OPTIND - 1)) # set ARGV to the first not parsed commandline parameter
+
+if [ -n "$1" ] ; then
+ echo "Error: unknown argument '$1' in options. Exiting to avoid possible data loss." >&2
+ bailout 1
+fi
# }}}
# read local (non-packaged) configuration {{{
# }}}
# read local (non-packaged) configuration {{{
@@
-463,7
+477,9
@@
if [ -z "$FORCE" ] ; then
echo -n "Is this ok for you? [y/N] "
read a
if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
echo -n "Is this ok for you? [y/N] "
read a
if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
- bailout 1 "Exiting as requested."
+ CLEAN_ARTIFACTS=0
+ echo "Exiting as requested."
+ exit 0
fi
echo
fi
fi
echo
fi
@@
-592,7
+608,7
@@
export SUITE # make sure it's available in FAI scripts
# validate whether the specified architecture class matches the
# architecture (option), otherwise installation of kernel will fail
# validate whether the specified architecture class matches the
# architecture (option), otherwise installation of kernel will fail
-if echo $CLASSES | grep -q
i i
386 ; then
+if echo $CLASSES | grep -q
w I
386 ; then
if ! [[ "$ARCH" == "i386" ]] ; then
log "Error: You specified the I386 class but are trying to build something else (AMD64?)."
eerror "Error: You specified the I386 class but are trying to build something else (AMD64?)."
if ! [[ "$ARCH" == "i386" ]] ; then
log "Error: You specified the I386 class but are trying to build something else (AMD64?)."
eerror "Error: You specified the I386 class but are trying to build something else (AMD64?)."
@@
-1211,7
+1227,7
@@
fi
# create md5sum file:
if [ -z "$BOOTSTRAP_ONLY" ] ; then
( cd $BUILD_OUTPUT/GRML/"${GRML_NAME}" &&
# create md5sum file:
if [ -z "$BOOTSTRAP_ONLY" ] ; then
( cd $BUILD_OUTPUT/GRML/"${GRML_NAME}" &&
- find .. -type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > md5sums )
+ find ..
/..
-type f -not -name md5sums -not -name isolinux.bin -exec md5sum {} \; > md5sums )
fi
# }}}
fi
# }}}