diff options
| author | Christopher Faylor <me@cgf.cx> | 2009-05-14 03:25:45 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2009-05-14 03:25:45 +0000 |
| commit | e951743709de78ef8149fcfbce88c07ef03ed4aa (patch) | |
| tree | 5b717c9e0551928250957e9e5b7d59770c94a81d /winsup/utils/mount.cc | |
| parent | 9708e8cde2d787305e07d11a24c5eb342fc3c35f (diff) | |
| download | cygnal-e951743709de78ef8149fcfbce88c07ef03ed4aa.tar.gz cygnal-e951743709de78ef8149fcfbce88c07ef03ed4aa.tar.bz2 cygnal-e951743709de78ef8149fcfbce88c07ef03ed4aa.zip | |
cygwin ChangeLog
2009-05-13 Corinna Vinschen <corinna@vinschen.de>
Christopher Faylor <me+cygwin@cgf.cx>
* mount.cc (mount_info::got_usr_bin): Define.
(mount_info::got_usr_lib): Ditto.
(mount_info::root_idx): Ditto.
(mount_info::create_root_entry): Create root entry as immutable and
flag as automatic.
(mount_info::init): Remove "Huh? No /etc/fstab..." warning.
Unconditionally call from_fstab for user and system tables. Fill in
/usr/bin and /usr/lib if they have not been specified in /etc/fstab.
(oopts): Alphabetize. Add "override" option to allow overriding
immutable mount points.
(mount_info::add_item): Accommodate new MOUNT_IMMUTABLE flag intended
for root mount.
(mount_info::add_item): Detect "/usr/bin", "/usr/lib", and "/" and set
appropriate global state.
(fillout_mntent): Add ,auto to mount points added by Cygwin DLL.
(mount): Remove masking of MOUNT_SYSTEM. Allow user to shoot
themselves. Add comment.
* mount.h (mount_info::got_usr_bin): Declare.
(mount_info::got_usr_lib): Ditto.
(mount_info::root_idx): Ditto.
* include/sys/mount.h: Reformat enum.
Add MOUNT_{OVERRIDE,IMMUTABLE,AUTOMATIC}.
doc ChangeLog
2009-05-13 Corinna Vinschen <corinna@vinschen.de>
Christopher Faylor <me+cygwin@cgf.cx>
* pathnames.sgml (mount-table): Sort mount options and add override
option. Add description of root mount handling.
utils ChangeLog
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.
Diffstat (limited to 'winsup/utils/mount.cc')
| -rw-r--r-- | winsup/utils/mount.cc | 19 |
1 files changed, 11 insertions, 8 deletions
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), |