X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=grml-live;h=fe462d58ae1e4dee3541a3cfb424ee2e10287b65;hp=e30aa12bdae5539567c971c734251028df796ebb;hb=31e514d282f56a14d0f8d4a5121ed626f6bef42c;hpb=338bbb2a14b9680e6eab3578220b1ab6e9a5d2cc diff --git a/grml-live b/grml-live index e30aa12..fe462d5 100755 --- a/grml-live +++ b/grml-live @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Dec 16 12:39:04 CET 2007 [mika] +# Latest change: Fri Dec 28 18:48:42 CET 2007 [mika] ################################################################################ # read configuration files, set some misc variables {{{ @@ -15,7 +15,7 @@ export LC_ALL=C # exit on any error: set -e -GRML_LIVE_VERSION='0.0.13' +GRML_LIVE_VERSION='0.0.15' CMDLINE="$0 $@" ISO_DATE="$(date +%Y-%m-%d)" @@ -43,6 +43,7 @@ VERBOSE='' FORCE='' UPDATE='' BUILD_ONLY='' +HOSTNAME='' if [ -r /etc/grml/lsb-functions ] ; then . /etc/grml/lsb-functions @@ -92,7 +93,7 @@ if [ -z "$LOGFILE" ] ; then fi touch $LOGFILE chown root:adm $LOGFILE -chmod 640 $LOGFILE +chmod 664 $LOGFILE NFSROOT_CONF=/etc/grml/fai/make-fai-nfsroot.conf @@ -392,8 +393,8 @@ else chmod 644 $CHROOT_OUTPUT/etc/grml_version # Remove all FAI logs from chroot if class RELEASE is used: - if [ -f $CHROOT_OUTPUT/etc/grml_fai_release ] ; then - rm -rf $CHROOT_OUTPUT/var/log/fai/* + if [ -f "$CHROOT_OUTPUT"/etc/grml_fai_release ] ; then + rm -rf "$CHROOT_OUTPUT"/var/log/fai/* fi umount $CHROOT_OUTPUT/proc 2>/dev/null || /bin/true