X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F15-initsetup;h=381c98850d4a7e08d1033aa3aaf0021b5cc57eb6;hb=1d4e632f0435e035d6c67f7a7f975aa127405dda;hp=a2f2417567aac9a1f25a02b82834435bae811ab9;hpb=4d8be9d76574c26bac8cd761f452f73ff78f7bc3;p=grml-live.git diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup index a2f2417..381c988 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup +++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup @@ -9,7 +9,9 @@ set -u set -e -if ! [ -r /etc/runlevel.conf ] ; then +[ -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' exit 0 @@ -17,10 +19,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