1 files changed, 8 insertions, 5 deletions

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 4d5c2243a..4eade0869 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -69,7 +69,6 @@
 //config:       bool "Support mounting NFS file systems on Linux < 2.6.23"
 //config:       default n
 //config:       depends on MOUNT
-//config:       select FEATURE_HAVE_RPC
 //config:       select FEATURE_SYSLOG
 //config:       help
 //config:       Enable mounting of NFS file systems on Linux kernels prior
@@ -2205,10 +2204,14 @@ int mount_main(int argc UNUSED_PARAM, char **argv)
 
         // Parse remaining options
         // Max 2 params; -o is a list, -v is a counter
-        opt_complementary = "?2" IF_FEATURE_MOUNT_VERBOSE("vv");
-        opt = getopt32(argv, OPTION_STR, &lst_o, &fstype, &O_optmatch
-                        IF_FEATURE_MOUNT_OTHERTAB(, &fstabname)
-                        IF_FEATURE_MOUNT_VERBOSE(, &verbose));
+        opt = getopt32(argv, "^"
+                OPTION_STR
+                "\0" "?2"IF_FEATURE_MOUNT_VERBOSE("vv"),
+                &lst_o, &fstype, &O_optmatch
+                IF_FEATURE_MOUNT_OTHERTAB(, &fstabname)
+                IF_FEATURE_MOUNT_VERBOSE(, &verbose)
+        );
+
         while (lst_o) append_mount_options(&cmdopts, llist_pop(&lst_o)); // -o
         if (opt & OPT_r) append_mount_options(&cmdopts, "ro"); // -r
         if (opt & OPT_w) append_mount_options(&cmdopts, "rw"); // -w