From owner-cvs-all@FreeBSD.ORG  Tue May 30 22:44:50 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@freebsd.org
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9DCF616B38E;
	Tue, 30 May 2006 22:44:50 +0000 (UTC)
	(envelope-from rodrigc@crodrigues.org)
Received: from rwcrmhc12.comcast.net (rwcrmhc12.comcast.net [216.148.227.152])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0802D43D4C;
	Tue, 30 May 2006 22:44:49 +0000 (GMT)
	(envelope-from rodrigc@crodrigues.org)
Received: from c-24-147-19-128.hsd1.ma.comcast.net
	(c-71-233-168-2.hsd1.ma.comcast.net[71.233.168.2](misconfigured
	sender)) by comcast.net (rwcrmhc12) with ESMTP
	id <20060530224448m1200j0vtne>; Tue, 30 May 2006 22:44:48 +0000
Received: from c-24-147-19-128.hsd1.ma.comcast.net (localhost [127.0.0.1])
	by c-24-147-19-128.hsd1.ma.comcast.net (8.13.6/8.13.1) with ESMTP id
	k4UMimei042578; Tue, 30 May 2006 18:44:48 -0400 (EDT)
	(envelope-from rodrigc@c-24-147-19-128.hsd1.ma.comcast.net)
Received: (from rodrigc@localhost)
	by c-24-147-19-128.hsd1.ma.comcast.net (8.13.6/8.13.1/Submit) id
	k4UMim6W042577; Tue, 30 May 2006 18:44:48 -0400 (EDT)
	(envelope-from rodrigc)
Date: Tue, 30 May 2006 18:44:48 -0400
From: Craig Rodrigues <rodrigc@crodrigues.org>
To: Maxim Konovalov <maxim@macomnet.ru>
Message-ID: <20060530224448.GA42556@crodrigues.org>
References: <200605261244.k4QCiCsl057619@repoman.freebsd.org>
	<20060529193947.M63890@mp2.macomnet.net>
	<20060529215827.D78736@mp2.macomnet.net>
	<20060530034531.GA36462@crodrigues.org>
	<20060530110750.A96470@mp2.macomnet.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20060530110750.A96470@mp2.macomnet.net>
User-Agent: Mutt/1.4.2.1i
Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/ufs/ffs ffs_vfsops.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 May 2006 22:45:02 -0000

On Tue, May 30, 2006 at 11:11:34AM +0400, Maxim Konovalov wrote:
> [root@sonnie ~]# mount -u -o noexec,ro /vol0

Can you try this patch?


Index: mount.c
===================================================================
RCS file: /home/ncvs/src/sbin/mount/mount.c,v
retrieving revision 1.84
diff -u -u -r1.84 mount.c
--- mount.c	10 May 2006 14:40:40 -0000	1.84
+++ mount.c	30 May 2006 20:13:23 -0000
@@ -184,6 +184,32 @@
 	return (0);
 }
 
+static
+int specified_ro(int argc, char *argv[])
+{
+	int i;
+	char *optbuf, *opt;
+	int ret = 0;
+
+	for (i=1; i < argc; i++) {
+		if (strcmp(argv[i-1], "-o") == 0) {
+			optbuf = strdup(argv[i]);
+			if (optbuf == NULL)
+				 err(1, NULL);
+
+			for (opt = optbuf; (opt = strtok(opt, ",")) != NULL;
+			    opt = NULL) {
+				if (strcmp(opt, "ro") == 0) {
+					ret = 1;
+					break;
+				}
+			}
+			free(optbuf);
+		}
+	}
+	return (ret);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -200,6 +226,9 @@
 	options = NULL;
 	vfslist = NULL;
 	vfstype = "ufs";
+
+	if (specified_ro(argc, argv))
+		ro = 1;
 	while ((ch = getopt(argc, argv, "adF:fo:prwt:uv")) != -1)
 		switch (ch) {
 		case 'a':
-- 
Craig Rodrigues        
rodrigc@crodrigues.org