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 nwipe to GRML_SMALL
[grml-live.git]
/
grml-live
diff --git
a/grml-live
b/grml-live
index
3964cbd
..
a6dcafb
100755
(executable)
--- a/
grml-live
+++ b/
grml-live
@@
-147,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 {{{
@@
-337,6
+343,11
@@
while getopts "a:C:c:d:D:e:g:i:I:o:r:s:t:U:v:AbBFhnNqQuVz" opt; do
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 {{{
@@
-1216,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
# }}}