X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRML%2F30-fstab;h=08cd375ca54189835b4f56129e06d9b9f80bc850;hp=7b91a9240e2777916a10bd12ceb6a5656a9cc8d5;hb=46e327ee238f7a1b11ec7c6895a0b4b87be9fbbe;hpb=229a51dfda4d619c47fb4b0ff94d4d952f61e62a

diff --git a/etc/grml/fai/config/scripts/GRML/30-fstab b/etc/grml/fai/config/scripts/GRML/30-fstab
index 7b91a92..08cd375 100755
--- a/etc/grml/fai/config/scripts/GRML/30-fstab
+++ b/etc/grml/fai/config/scripts/GRML/30-fstab
@@ -1,28 +1,23 @@
 #!/bin/sh
+# Filename:      /etc/grml/fai/config/scripts/GRML/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
 set -e
 
-cat > "$target"/etc/fstab << EOF
-# /etc/fstab - static file system information
-# <filesystem> <mountpoint>   <type> <options>                             <dump> <pass>
-proc           /proc          proc   rw,nosuid,nodev,noexec                 0      0
-none           /proc/bus/usb  usbfs  defaults,noauto                        0      0
-sysfs          /sys           sysfs  rw,nosuid,nodev,noexec                 0      0
-devpts         /dev/pts       devpts noauto,mode=0622                       0      0
-/dev/fd0       /mnt/floppy    auto   users,noauto,exec                      0      0
-/dev/external  /mnt/external  auto   users,noauto,exec,rw,uid=grml,gid=grml 0      0
-/dev/external1 /mnt/external1 auto   users,noauto,exec,rw,uid=grml,gid=grml 0      0
-/dev/cdrom     /mnt/cdrom     auto   users,noauto,exec,ro                   0      0
-/dev/dvd       /mnt/dvd       auto   users,noauto,exec,ro                   0      0
-# some other examples:
-# /dev/hda1      /Grml         ext3    dev,suid,user,noauto 0  2
-# //1.2.3.4/pub  /smb/pub      smbfs   defaults,user,noauto,uid=grml,gid=grml 0 0
-# linux:/pub     /beer         nfs     defaults             0  0
-# tmpfs          /tmp          tmpfs   size=300M            0  0
-# none           /proc/bus/usb usbfs   defaults,nodev,noexec,nosuid,noauto,devgid=1001,devmode=664 0 0
-# 192.168.1.101:/backups /mnt/nfs nfs  defaults,users,wsize=8192,rsize=8192 0 0
-#
-# Warning! Please do *not* change any lines below because they are auto-generated by rebuildfstab!
-# If you want to disable rebuildfstab set CONFIG_FSTAB='no' in /etc/grml/autoconfig!
-# See 'man grml-rebuildfstab' for more details about the following entries.
-EOF
+USERNAME=''
+[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -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
+
+## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3