X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F30-fstab;h=c316ec6ec572291d23e5e842aa90d379a2ca4e0c;hp=fd52cf76622a11bb7c6dd4864a2b10ac1abe6e57;hb=ef51d0c8f7f9fcfa8faf0fa800b4a865517666a2;hpb=9dafaad2fe959f195d68a38655f60d00ee028256

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
index fd52cf7..c316ec6 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
+++ b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
@@ -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/fstab
 sed -i "s/uid=USERNAME,gid=USERNAME/uid=$USERNAME,gid=$USERNAME/" $target/etc/fstab