Use 'user' instead of 'users' again after discussing the issue

diff --git a/debian/changelog b/debian/changelog
index 1938e75..00e0858 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ grml-live (0.9.11) unstable; urgency=low
 
   * Remove base64 from GRML_FULL as coreutils (>= 6.0-1) provide
     a base64 binary now.
+  * Use 'user' instead of 'users' again after discussing the issue
+    in issue582.
 
- -- Michael Prokop <mika@grml.org>  Sun, 01 Mar 2009 17:53:23 +0100
+ -- Michael Prokop <mika@grml.org>  Sun, 01 Mar 2009 20:23:49 +0100
 
 grml-live (0.9.10) unstable; urgency=low
 

diff --git a/etc/grml/fai/files/etc/fstab b/etc/grml/fai/files/etc/fstab
index 53567fa..48a4110 100644 (file)
--- a/etc/grml/fai/files/etc/fstab
+++ b/etc/grml/fai/files/etc/fstab
@@ -4,18 +4,18 @@ proc           /proc          proc   rw,nosuid,nodev,noexec                 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=USERNAME,gid=USERNAME 0      0
-/dev/external1 /mnt/external1 auto   users,noauto,exec,rw,uid=USERNAME,gid=USERNAME 0      0
-/dev/cdrom     /mnt/cdrom     auto   users,noauto,exec,ro                   0      0
-/dev/dvd       /mnt/dvd       auto   users,noauto,exec,ro                   0      0
+/dev/fd0       /mnt/floppy    auto   user,noauto,exec                       0      0
+/dev/external  /mnt/external  auto   user,noauto,exec,rw,uid=USERNAME,gid=USERNAME 0      0
+/dev/external1 /mnt/external1 auto   user,noauto,exec,rw,uid=USERNAME,gid=USERNAME 0      0
+/dev/cdrom     /mnt/cdrom     auto   user,noauto,exec,ro                    0      0
+/dev/dvd       /mnt/dvd       auto   user,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
+# 192.168.1.101:/backups /mnt/nfs nfs  defaults,user,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!