diff options
| author | Prem Karat <prem.karat@linux.vnet.ibm.com> | 2011-06-30 07:29:20 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2011-06-30 08:59:22 -0400 |
| commit | 684cf4a5e0e84a1367690d7ecf4882cbdf4f3228 (patch) | |
| tree | 998897898d6b9bb1e513d1f19ce9a555e22122a6 /utils/mount/mount.c | |
| parent | 869db826075d1707985c7ac78b4e3af3301c511c (diff) | |
| download | nfs-utils-684cf4a5e0e84a1367690d7ecf4882cbdf4f3228.tar.gz nfs-utils-684cf4a5e0e84a1367690d7ecf4882cbdf4f3228.tar.xz nfs-utils-684cf4a5e0e84a1367690d7ecf4882cbdf4f3228.zip | |
mount.nfs: Fix for the bug in v1.2.4 that breaks mount.nfs
commit 30ebf047 failed to include these changes that breaks mount.nfs.
mount.nfs will continue to work fine with these changes
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/mount/mount.c')
| -rw-r--r-- | utils/mount/mount.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 62115bb..eea00af 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -385,14 +385,6 @@ int main(int argc, char *argv[]) if(!strncmp(progname, "umount", strlen("umount"))) exit(nfsumount(argc, argv)); - if (argv[1] && argv[1][0] == '-') { - if(argv[1][1] == 'V') - printf("%s ("PACKAGE_STRING")\n", progname); - else - mount_usage(); - exit(EX_SUCCESS); - } - if ((argc < 3)) { mount_usage(); exit(EX_USAGE); @@ -400,8 +392,7 @@ int main(int argc, char *argv[]) mount_config_init(progname); - argv[2] = argv[0]; /* so that getopt error messages are correct */ - while ((c = getopt_long(argc - 2, argv + 2, "rvVwfno:hs", + while ((c = getopt_long(argc, argv, "rvVwfno:hs", longopts, NULL)) != -1) { switch (c) { case 'r': |