From 3a3e2c9f200e7eccf7842b33510b78a12b45e19b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 25 Aug 2008 15:07:26 +0200 Subject: [PATCH] Fix syntax error --- etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives | 5 +---- etc/grml/fai/live-initramfs/grml-script.init-top | 8 +++++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives index fb0912c..a413a40 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -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: Mon Aug 25 13:24:20 CEST 2008 [mika] +# Latest change: Mon Aug 25 15:07:12 CEST 2008 [mika] ################################################################################ set -u @@ -20,9 +20,6 @@ fi # $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny # fi -if [ -r $target/usr/bin/vim.tiny ] ; then -fi - if [ -r $target/usr/bin/uxterm ] ; then $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm elif [ -r $target/usr/bin/xterm ] ; then diff --git a/etc/grml/fai/live-initramfs/grml-script.init-top b/etc/grml/fai/live-initramfs/grml-script.init-top index a9bd284..367f79f 100755 --- a/etc/grml/fai/live-initramfs/grml-script.init-top +++ b/etc/grml/fai/live-initramfs/grml-script.init-top @@ -119,11 +119,13 @@ fi echo "" echo "${WHITE}Welcome to" echo "$SPLASH" - -echo -log_grml_begin_msg "Running $GRML_VERSION" echo +if [ -n "$GRML_VERSION" ] ; then + log_grml_begin_msg "Running $GRML_VERSION" + echo +fi + # don't output anything if running with bootsplash feature if checkbootparam "splash" ; then exec >/dev/null &1 -- 2.1.4