X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F30-fstab;h=663887870982447db497808598bae54e273e2999;hb=08d8db7511b78113edfb8ef04a40706315fd73a7;hp=08cd375ca54189835b4f56129e06d9b9f80bc850;hpb=e08881cde5d29236a5992a0a501b43e88d66732d;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 08cd375..6638878 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab +++ b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab @@ -1,17 +1,17 @@ #!/bin/sh -# Filename: /etc/grml/fai/config/scripts/GRML/30-fstab +# Filename: /etc/grml/fai/config/scripts/GRMLBASE/30-fstab # Purpose: create initial /etc/fstab for use on live-system # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Sep 16 23:09:08 CEST 2007 [mika] ################################################################################ set -u set -e USERNAME='' -[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf +[ -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 if [ -r /etc/grml/fai/files/etc/fstab ] ; then