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

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
index 80f58d9..fd52cf7 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
+++ b/etc/grml/fai/config/scripts/GRMLBASE/30-fstab
@@ -1,10 +1,9 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/30-fstab
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/30-fstab
 # Purpose:       create initial /etc/fstab for use on live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # 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
@@ -12,13 +11,11 @@ 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 "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
 [ -n "$USERNAME" ] || USERNAME=grml
 
-if [ -r /etc/grml/fai/files/etc/fstab ] ; then
-   cp /etc/grml/fai/files/etc/fstab $target/etc/fstab
-   sed -i "s/uid=USERNAME,gid=USERNAME/uid=$USERNAME,gid=$USERNAME/" $target/etc/fstab
-fi
+fcopy -v /etc/fstab
+sed -i "s/uid=USERNAME,gid=USERNAME/uid=$USERNAME,gid=$USERNAME/" $target/etc/fstab
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2