summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobert <robert@openbsd.org>2020-12-11 06:29:43 +0000
committerrobert <robert@openbsd.org>2020-12-11 06:29:43 +0000
commitc48ae492b88ebed7dbd0b96be6b17e5dbcd08d89 (patch)
tree0563f3b108e2e1cfdfaa1fd1d21aae14e8cff301
parentcat(1): -n flag: correctly enumerate files with more than INT_MAX lines (diff)
downloadwireguard-openbsd-c48ae492b88ebed7dbd0b96be6b17e5dbcd08d89.tar.xz
wireguard-openbsd-c48ae492b88ebed7dbd0b96be6b17e5dbcd08d89.zip
pass down the `skip' flag to the mountfs() function in the case of
manually mounting a device which is not present in fstab(5) so that the `-s' flag can be used in this case as well. ok millert@, deraadt@
-rw-r--r--sbin/mount/mount.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index c212bd71668..0d742a8d49b 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mount.c,v 1.73 2019/07/19 15:13:17 millert Exp $ */
+/* $OpenBSD: mount.c,v 1.74 2020/12/11 06:29:43 robert Exp $ */
/* $NetBSD: mount.c,v 1.24 1995/11/18 03:34:29 cgd Exp $ */
/*
@@ -276,7 +276,7 @@ main(int argc, char * const argv[])
mntonname, options, fs->fs_mntops, skip);
break;
case 2:
- rval = mountfs(vfstype, argv[0], argv[1], options, NULL, 0);
+ rval = mountfs(vfstype, argv[0], argv[1], options, NULL, skip);
break;
default:
usage();