diff options
| author | Karel Zak | 2011-03-11 16:58:27 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-03-11 16:58:27 +0100 |
| commit | 2ac1890aa0d8ce404528587134fcabe0e2834963 (patch) | |
| tree | eb8ac62c6b7952fed4d5f3d06840e78bafc38bd0 /mount | |
| parent | tests: update GPT test (diff) | |
| download | kernel-qcow2-util-linux-2ac1890aa0d8ce404528587134fcabe0e2834963.tar.gz kernel-qcow2-util-linux-2ac1890aa0d8ce404528587134fcabe0e2834963.tar.xz kernel-qcow2-util-linux-2ac1890aa0d8ce404528587134fcabe0e2834963.zip | |
mount: rename "quiet" to "silent" (MS_SILENT)
The quiet mount option was in collision with vfat and hfs mount
options. The option was also undocumented -- so it's probably safe to
rename the option than add some ugly hacks or exceptions for vfat/hfs
to the mount(8) code.
Reported-by: https://bugzilla.redhat.com/show_bug.cgi?id=622089
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'mount')
| -rw-r--r-- | mount/mount.8 | 6 | ||||
| -rw-r--r-- | mount/mount.c | 2 | ||||
| -rw-r--r-- | mount/mount_constants.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mount/mount.8 b/mount/mount.8 index d47104652..e8f831882 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -963,6 +963,12 @@ Do not allow set-user-identifier or set-group-identifier bits to take effect. (This seems safe, but is in fact rather unsafe if you have suidperl(1) installed.) .TP +.B silent +Turn on the silent flag. +.TP +.B loud +Turn off the silent flag. +.TP .B owner Allow an ordinary (i.e., non-root) user to mount the filesystem if he is the owner of the device. diff --git a/mount/mount.c b/mount/mount.c index 1c5fe5a3a..d9739897f 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -172,7 +172,7 @@ static const struct opt_map opt_map[] = { { "nosub", 0, 0, MS_NOSUB }, /* don't allow submounts */ #endif #ifdef MS_SILENT - { "quiet", 0, 0, MS_SILENT }, /* be quiet */ + { "silent", 0, 0, MS_SILENT }, /* be quiet */ { "loud", 0, 1, MS_SILENT }, /* print out messages. */ #endif #ifdef MS_MANDLOCK diff --git a/mount/mount_constants.h b/mount/mount_constants.h index 81686f1df..ce51887dd 100644 --- a/mount/mount_constants.h +++ b/mount/mount_constants.h @@ -37,8 +37,8 @@ #ifndef MS_REC #define MS_REC 0x4000 /* 16384: Recursive loopback */ #endif -#ifndef MS_VERBOSE -#define MS_VERBOSE 0x8000 /* 32768 */ +#ifndef MS_SILENT +#define MS_SILENT 0x8000 /* 32768 (was MS_VERBOSE) */ #endif #ifndef MS_RELATIME #define MS_RELATIME 0x200000 /* 200000: Update access times relative |