From 120b57c149d09765bdc3fddd807a41544a7141cd Mon Sep 17 00:00:00 2001
From: dd <dd@FreeBSD.org>
Date: Wed, 2 May 2001 02:16:16 +0000
Subject: [PATCH] Implement the -r and -w options as `-o ro' and `-o noro',
 respectively.  At least in -w's case, simply unsetting the correct bit in
 init_flags was not enough.  The bit may be reset later if, say, the
 filesystem is marked `ro' in fstab.  The command line option should override
 the fstab setting, but did not.  The implementation of -r was changed for
 consistency.

PR:		26886
Reviewed by:	archie
---
 sbin/mount/mount.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 877339b731b6..eb9fdba53e3e 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -158,7 +158,7 @@ main(argc, argv)
 			verbose = 1;
 			break;
 		case 'r':
-			init_flags |= MNT_RDONLY;
+			options = catopt(options, "ro");
 			break;
 		case 't':
 			if (vfslist != NULL)
@@ -173,7 +173,7 @@ main(argc, argv)
 			verbose = 1;
 			break;
 		case 'w':
-			init_flags &= ~MNT_RDONLY;
+			options = catopt(options, "noro");
 			break;
 		case '?':
 		default: