diff options
| author | Karel Zak | 2012-01-25 12:26:49 +0100 |
|---|---|---|
| committer | Karel Zak | 2012-01-25 12:34:02 +0100 |
| commit | 077b15dcaa457911caa5bf46f3cbd016bea19e0c (patch) | |
| tree | 5df116af85b43fc7e48decc08ff825146fb4be36 /misc-utils/blkid.c | |
| parent | mount: (new) add more info about --stab to mount.8 (diff) | |
| download | kernel-qcow2-util-linux-077b15dcaa457911caa5bf46f3cbd016bea19e0c.tar.gz kernel-qcow2-util-linux-077b15dcaa457911caa5bf46f3cbd016bea19e0c.tar.xz kernel-qcow2-util-linux-077b15dcaa457911caa5bf46f3cbd016bea19e0c.zip | |
blkid: remove -w option from man page and usage() output
The option does not have any effect, the original functionality was
removed from e2fsprogs in year 2003 by
commit 50b380b4d4ab668bad45033e3a8aaf93c7f42844
git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git
So.. don't propagate the option to users in year 2012 :-)
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/blkid.c')
| -rw-r--r-- | misc-utils/blkid.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index 0ff89d66f..2976bca02 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -62,7 +62,7 @@ static void usage(int error) "Usage:\n" " %1$s -L <label> | -U <uuid>\n\n" " %1$s [-c <file>] [-ghlLv] [-o <format>] [-s <tag>] \n" - " [-t <token>] [-w <file>] [<dev> ...]\n\n" + " [-t <token>] [<dev> ...]\n\n" " %1$s -p [-s <tag>] [-O <offset>] [-S <size>] \n" " [-o <format>] <dev> ...\n\n" " %1$s -i [-s <tag>] [-o <format>] <dev> ...\n\n" @@ -80,7 +80,6 @@ static void usage(int error) " -L <label> convert LABEL to device name\n" " -U <uuid> convert UUID to device name\n" " -v print version and exit\n" - " -w <file> write cache to different file (/dev/null = no write)\n" " <dev> specify device(s) to probe (default: all devices)\n\n" "Low-level probing options:\n" " -p low-level superblocks probing (bypass cache)\n" @@ -673,7 +672,6 @@ int main(int argc, char **argv) char *show[128] = { NULL, }; char *search_type = NULL, *search_value = NULL; char *read = NULL; - char *write = NULL; int fltr_usage = 0; char **fltr_type = NULL; int fltr_flag = BLKID_FLTR_ONLYIN; @@ -695,8 +693,6 @@ int main(int argc, char **argv) read = NULL; else read = optarg; - if (!write) - write = read; break; case 'd': raw_chars = 1; @@ -803,10 +799,7 @@ int main(int argc, char **argv) version = 1; break; case 'w': - if (optarg && !*optarg) - write = NULL; - else - write = optarg; + /* ignore - backward compatibility */ break; case 'h': err = 0; |