projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use sane paths for intermediate EFI files
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
20-sudo
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
index
d89c196
..
49fccff
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/20-sudo
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/20-sudo
@@
-8,13
+8,9
@@
set -u
set -e
set -u
set -e
+. "$GRML_LIVE_CONFIG"
-USERNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
-[ -n "$USERNAME" ] || USERNAME=grml
-
-fcopy /etc/sudoers
+fcopy -v /etc/sudoers
sed -i "s/\$USERNAME/$USERNAME/" $target/etc/sudoers
chmod 440 $target/etc/sudoers
sed -i "s/\$USERNAME/$USERNAME/" $target/etc/sudoers
chmod 440 $target/etc/sudoers