projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
c49f70c
..
d7ad56e
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@
-9,6
+9,11
@@
set -u
set -e
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'
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,10
+31,16
@@
fi
cp $target/etc/runlevel.conf $target/etc/runlevel.conf.original
# provide Grml's default file-rc configuration
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
# provide Grml's inittab configuration
-fcopy /etc/inittab
+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=2
## END OF FILE #################################################################
# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2