X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F30-fstab;h=c316ec6ec572291d23e5e842aa90d379a2ca4e0c;hb=8d91fa8e1b3b6d46a1333928a7384a463868cce0;hp=1585caf066d9f24f161900b265b0be0e99fd342d;hpb=dd814754c67b9089428e17756d40fd848c58647f;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
index 1585caf..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
-[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
-[ -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