From 1d4e632f0435e035d6c67f7a7f975aa127405dda Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 28 Sep 2009 14:15:17 +0200 Subject: [PATCH] scripts/GRMLBASE/15-initsetup: assume safe GRML_NAME default --- debian/changelog | 3 ++- etc/grml/fai/config/scripts/GRMLBASE/15-initsetup | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3101752..b06c57f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,8 +26,9 @@ grml-live (0.9.23) unstable; urgency=low * Update documentation regarding recent lzma development. * Some minor cosmetic corrections in grml-live's output. * Add missing test call in $FORCE_ISO_REBUILD code. + * scripts/GRMLBASE/15-initsetup: assume safe GRML_NAME default. - -- Michael Prokop Mon, 28 Sep 2009 14:13:02 +0200 + -- Michael Prokop Mon, 28 Sep 2009 14:14:38 +0200 grml-live (0.9.22) unstable; urgency=low diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup index 23eed89..381c988 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup @@ -9,6 +9,8 @@ set -u set -e +[ -z "$GRML_NAME" ] && GRML_NAME=grml + if ! [ -r $target/etc/runlevel.conf ] ; then echo 'Warning: /etc/runlevel.conf does not exist...' echo '... assuming we do not have file-rc, skipping 15-initsetup' -- 2.1.4