Make username replacement in inittab more robust

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 15-initsetup

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
index fd8b1c6..d7ad56e 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/15-initsetup
 # Purpose:       configure init system for the live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -9,6 +9,11 @@
 set -u
 set -e
 
+USERNAME=''
+[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
+[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
+[ -n "$USERNAME" ] || USERNAME=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'
@@ -26,7 +31,16 @@ fi
 cp $target/etc/runlevel.conf $target/etc/runlevel.conf.original
 
 # provide Grml's default file-rc configuration
-fcopy /etc/runlevel.conf
+fcopy -v /etc/runlevel.conf
+
+# provide Grml's inittab configuration
+fcopy -v /etc/inittab
+sed -i "s/\$USERNAME\$/${USERNAME}/" $target/etc/inittab
+
+# provide Grml's bootlocal init scripts
+fcopy -v /etc/init.d/bootlocal.first
+fcopy -v /etc/init.d/bootlocal.middle
+fcopy -v /etc/init.d/bootlocal.last
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2