From: Michael Prokop <mika@grml.org>
Date: Wed, 26 Aug 2009 21:41:14 +0000 (+0200)
Subject: Fix usage of /etc/runlevel.conf in 15-initsetup
X-Git-Tag: v0.9.22~16
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=4bc9ff42e577dee47f8928b7d88c00a4d1b5932c

Fix usage of /etc/runlevel.conf in 15-initsetup
---

diff --git a/debian/changelog b/debian/changelog
index 62f6749..fbc1c3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,9 @@ grml-live (0.9.22) UNRELEASED; urgency=low
     be fine to re-run grml-live with -u/-b options.
   * Fix usage of exclude option in $SQUASHFS_OPTIONS.
   * Always remove temporary squashfs stderr file.
+  * Fix usage of /etc/runlevel.conf in 15-initsetup.
 
- -- Michael Prokop <mika@grml.org>  Wed, 26 Aug 2009 23:27:01 +0200
+ -- Michael Prokop <mika@grml.org>  Wed, 26 Aug 2009 23:39:42 +0200
 
 grml-live (0.9.21) unstable; urgency=low
 
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index a2f2417..23eed89 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -9,7 +9,7 @@
 set -u
 set -e
 
-if ! [ -r /etc/runlevel.conf ] ; then
+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'
    exit 0
@@ -17,10 +17,10 @@ fi
 
 # keep a backup of the original runlevel.conf file for reference
 # but only save it as /etc/runlevel.conf.original if it's not the
-# according livecd version, this should prevent from overriding
-# /etc/runlevel.conf.original if re-running grml-live -b ...
-if ! cmp /etc/runlevel.conf /etc/runlevel.conf.livecd 1>/dev/null || \
-   ! cmp /etc/runlevel.conf /etc/runlevel.conf.livecd.small 1>/dev/null ; then
+# according live system version, this should prevent from overriding
+# /etc/runlevel.conf.original if re-running grml-live with -b option.
+if ! cmp $target/etc/runlevel.conf $target/etc/runlevel.conf.livecd 1>/dev/null || \
+   ! cmp $target/etc/runlevel.conf $target/etc/runlevel.conf.livecd.small 1>/dev/null ; then
 
    # make sure to store old backup files if they differ as well
    if [ -r $target/etc/runlevel.conf.original ] ; then