diff options
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 9 | ||||
| -rw-r--r-- | winsup/utils/mount.cc | 19 | ||||
| -rw-r--r-- | winsup/utils/utils.sgml | 9 |
3 files changed, 25 insertions, 12 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index cb29eee31..7024e29f3 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,12 @@ +2009-05-13 Corinna Vinschen <corinna@vinschen.de> + Christopher Faylor <me+cygwin@cgf.cx> + + * mount.cc (oopts): Sort. Add override option. Add dummy "auto" + option for consistency. + (mount_entries): Avoid adding auto-mounted entries to -m output. + + * utils.sgml: Sort mount options. Add description of override option. + 2009-05-11 Corinna Vinschen <corinna@vinschen.de> * Makefile.in: Link ps.exe agains ntdll.dll. diff --git a/winsup/utils/mount.cc b/winsup/utils/mount.cc index fd2d6c539..a7903946c 100644 --- a/winsup/utils/mount.cc +++ b/winsup/utils/mount.cc @@ -1,7 +1,7 @@ /* mount.cc Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, - 2008 Red Hat, Inc. + 2008, 2009 Red Hat, Inc. This file is part of Cygwin. @@ -132,16 +132,19 @@ struct opt bool clear; } oopts[] = { + {"acl", MOUNT_NOACL, true}, + {"auto", 0, false}, {"binary", MOUNT_BINARY, false}, - {"text", MOUNT_BINARY, true}, - {"exec", MOUNT_EXEC, false}, - {"notexec", MOUNT_NOTEXEC, false}, {"cygexec", MOUNT_CYGWIN_EXEC, false}, - {"nosuid", 0, 0}, - {"acl", MOUNT_NOACL, true}, + {"exec", MOUNT_EXEC, false}, {"noacl", MOUNT_NOACL, false}, - {"posix=1", MOUNT_NOPOSIX, true}, + {"nosuid", 0, false}, + {"notexec", MOUNT_NOTEXEC, false}, + {"override", MOUNT_OVERRIDE, true}, {"posix=0", MOUNT_NOPOSIX, false}, + {"posix=1", MOUNT_NOPOSIX, true}, + {"text", MOUNT_BINARY, true}, + {"user", MOUNT_SYSTEM, true} }; static void @@ -366,7 +369,7 @@ mount_entries (void) // write fstab entries for normal mount points while ((p = getmntent (m)) != NULL) // Only list non-cygdrives - if (!strstr (p->mnt_opts, ",noumount")) + if (!strstr (p->mnt_opts, ",noumount") && !strstr (p->mnt_opts, ",auto")) { char fsname[NT_MAX_PATH], dirname[NT_MAX_PATH]; printf (format_mnt, convert_spaces (fsname, p->mnt_fsname), diff --git a/winsup/utils/utils.sgml b/winsup/utils/utils.sgml index e78aa120d..751557700 100644 --- a/winsup/utils/utils.sgml +++ b/winsup/utils/utils.sgml @@ -786,16 +786,17 @@ most of the options are duplicates of other mount flags):</para> <screen> acl - Use the filesystem's access control lists (ACLs) to implement real POSIX permissions (default). - noacl - Ignore ACLs and fake POSIX permissions. binary - Files default to binary mode (default). - text - Files default to CRLF text mode line endings. - exec - Treat all files below mount point as executable. - notexec - Treat all files below mount point as not executable. cygexec - Treat all files below mount point as cygwin executables. + exec - Treat all files below mount point as executable. + noacl - Ignore ACLs and fake POSIX permissions. nosuid - No suid files are allowed (currently unimplemented) + notexec - Treat all files below mount point as not executable. + override - Override immutable mount points. posix=0 - Switch off case sensitivity for paths under this mount point. posix=1 - Switch on case sensitivity for paths under this mount point (default). + text - Files default to CRLF text mode line endings. </screen> <para>For a more complete description of the mount options and the |