From owner-cvs-src@FreeBSD.ORG Wed Mar 5 08:25:51 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 983831065670; Wed, 5 Mar 2008 08:25:51 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 858548FC15; Wed, 5 Mar 2008 08:25:51 +0000 (UTC) (envelope-from rodrigc@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m258Ppab016742; Wed, 5 Mar 2008 08:25:51 GMT (envelope-from rodrigc@repoman.freebsd.org) Received: (from rodrigc@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m258Ppv2016738; Wed, 5 Mar 2008 08:25:51 GMT (envelope-from rodrigc) Message-Id: <200803050825.m258Ppv2016738@repoman.freebsd.org> From: Craig Rodrigues Date: Wed, 5 Mar 2008 08:25:49 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sbin/fsck_ffs main.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2008 08:25:51 -0000 rodrigc 2008-03-05 08:25:49 UTC FreeBSD src repository Modified files: sbin/fsck_ffs main.c Log: For a mounted file system which is read-only, when doing the MNT_RELOAD, pass in "ro" and "update" string mount options to nmount() instead of MNT_RDONLY and MNT_UPDATE flags. Due to the complexity of the mount parsing code especially with respect to the root file system, passing in MNT_RDONLY and MNT_UPDATE flags would do weird things and would cause fsck to convert the root file system from a read-only mount to read-write. To test: - boot into single user mode - show mounted file systems with: mount - root file system should be mounted read-only - fsck / - show mounted file systems with: mount - root file system should still be mounted read-only PR: 120319 MFC after: 1 month Reported by: yar Revision Changes Path 1.49 +3 -1 src/sbin/fsck_ffs/main.c