projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GRMLBASE/98-clean-chroot: get rid of all lvm backup files
[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
d7ad56e
..
277dcb0
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/15-initsetup
@@
-8,11
+8,7
@@
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
+. "$GRML_LIVE_CONFIG"
if ! [ -r $target/etc/runlevel.conf ] ; then
echo 'Warning: /etc/runlevel.conf does not exist...'
if ! [ -r $target/etc/runlevel.conf ] ; then
echo 'Warning: /etc/runlevel.conf does not exist...'