summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2009-05-14 09:56:45 +0000
committerCorinna Vinschen <corinna@vinschen.de>2009-05-14 09:56:45 +0000
commitf7c246620ded0dc73b7c11fd89b550ab746459d9 (patch)
treec55900dd216b37f1147b81bc6984fa2be6ed4285
parente951743709de78ef8149fcfbce88c07ef03ed4aa (diff)
downloadcygnal-f7c246620ded0dc73b7c11fd89b550ab746459d9.tar.gz
cygnal-f7c246620ded0dc73b7c11fd89b550ab746459d9.tar.bz2
cygnal-f7c246620ded0dc73b7c11fd89b550ab746459d9.zip
* mount.cc (oopts): Add a no-op "auto" option.
(mount_info::create_root_entry): Set root dir to MOUNT_IMMUTABLE rather than to MOUNT_OVERRIDE.
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/mount.cc3
2 files changed, 8 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index da7eb81bf..3efda4c6a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-14 Corinna Vinschen <corinna@vinschen.de>
+
+ * mount.cc (oopts): Add a no-op "auto" option.
+ (mount_info::create_root_entry): Set root dir to MOUNT_IMMUTABLE rather
+ than to MOUNT_OVERRIDE.
+
2009-05-13 Corinna Vinschen <corinna@vinschen.de>
Christopher Faylor <me+cygwin@cgf.cx>
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index 9bc1896f9..4c2199cd5 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -308,7 +308,7 @@ mount_info::create_root_entry (const PWCHAR root)
char native_root[PATH_MAX];
sys_wcstombs (native_root, PATH_MAX, root);
mount_table->add_item (native_root, "/",
- MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_OVERRIDE | MOUNT_AUTOMATIC);
+ MOUNT_SYSTEM | MOUNT_BINARY | MOUNT_IMMUTABLE | MOUNT_AUTOMATIC);
/* Create a default cygdrive entry. Note that this is a user entry.
This allows to override it with mount, unless the sysadmin created
a cygdrive entry in /etc/fstab. */
@@ -859,6 +859,7 @@ struct opt
} oopts[] =
{
{"acl", MOUNT_NOACL, 1},
+ {"auto", 0, 0},
{"binary", MOUNT_BINARY, 0},
{"cygexec", MOUNT_CYGWIN_EXEC, 0},
{"exec", MOUNT_EXEC, 0},