X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F15-initsetup;h=72ac5012cbda5f9a8c92df1f75a56e6a0d648f57;hp=72bd7714e361e4facddc94dbb656e4833b5bbc01;hb=5d4cdf0789b5814936a60497542d7d925b041bc0;hpb=976e0a367cd28d2dd9e14c314e099715896abda9

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index 72bd771..72ac501 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
 # Purpose:       configure init system for the live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -9,16 +9,21 @@
 set -u
 set -e
 
+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
+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 >/dev/null ; then
 
    # make sure to store old backup files if they differ as well
    if [ -r $target/etc/runlevel.conf.original ] ; then
-      if ! cmp $target/etc/runlevel.conf $target/etc/runlevel.conf.original 1>/dev/null ; then
+      if ! cmp $target/etc/runlevel.conf $target/etc/runlevel.conf.original >/dev/null ; then
          cp $target/etc/runlevel.conf.original $target/etc/runlevel.conf.original."$(date +%Y%m%d_%k:%M:%S)"
       fi
    fi
@@ -26,14 +31,8 @@ if ! cmp /etc/runlevel.conf /etc/runlevel.conf.livecd 1>/dev/null || \
    cp $target/etc/runlevel.conf $target/etc/runlevel.conf.original
 fi
 
-# if we have a small ISO let's adjust runlevel.conf:
-if [ -n "$GRML_NAME" ] ; then
-   if echo "$GRML_NAME" | grep -q small ; then
-      cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
-   else
-      cp $target/etc/runlevel.conf.livecd $target/etc/runlevel.conf
-   fi
-fi
+# provide Grml's default file-rc configuration
+fcopy /etc/runlevel.conf
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3