X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F20-sudo;fp=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F20-sudo;h=49fccff26b5f2a15f54d51789fbf2d80ff72af38;hp=be6d2429925df21f0168066509e5bf07f474f95d;hb=ef51d0c8f7f9fcfa8faf0fa800b4a865517666a2;hpb=352c82226ec5489438b7066db702fb31aa5c68a3

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
index be6d242..49fccff 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
+++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
@@ -8,11 +8,7 @@
 
 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"
 
 fcopy -v /etc/sudoers
 sed -i "s/\$USERNAME/$USERNAME/" $target/etc/sudoers