From owner-svn-src-stable@FreeBSD.ORG Wed Jun 17 09:42:30 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5CB74106566C; Wed, 17 Jun 2009 09:42:30 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 49F7D8FC1A; Wed, 17 Jun 2009 09:42:30 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5H9gUQU069091; Wed, 17 Jun 2009 09:42:30 GMT (envelope-from avg@svn.freebsd.org) Received: (from avg@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5H9gUi7069088; Wed, 17 Jun 2009 09:42:30 GMT (envelope-from avg@svn.freebsd.org) Message-Id: <200906170942.n5H9gUi7069088@svn.freebsd.org> From: Andriy Gapon Date: Wed, 17 Jun 2009 09:42:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194339 - in stable/7/etc: . defaults mtree rc.d X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2009 09:42:31 -0000 Author: avg Date: Wed Jun 17 09:42:30 2009 New Revision: 194339 URL: http://svn.freebsd.org/changeset/base/194339 Log: MFC r193944: rc.d/fsck: allow additional options via fsck_y_flags Modified: stable/7/etc/ (props changed) stable/7/etc/defaults/rc.conf stable/7/etc/mtree/ (props changed) stable/7/etc/rc.d/ (props changed) stable/7/etc/rc.d/fsck Modified: stable/7/etc/defaults/rc.conf ============================================================================== --- stable/7/etc/defaults/rc.conf Wed Jun 17 09:29:18 2009 (r194338) +++ stable/7/etc/defaults/rc.conf Wed Jun 17 09:42:30 2009 (r194339) @@ -83,6 +83,7 @@ geli_swap_flags="-e aes -l 256 -s 4096 - root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. +fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. netfs_types="nfs:NFS nfs4:NFS4 smbfs:SMB portalfs:PORTAL nwfs:NWFS" # Net filesystems. Modified: stable/7/etc/rc.d/fsck ============================================================================== --- stable/7/etc/rc.d/fsck Wed Jun 17 09:29:18 2009 (r194338) +++ stable/7/etc/rc.d/fsck Wed Jun 17 09:42:30 2009 (r194339) @@ -44,8 +44,8 @@ fsck_start() ;; 8) if checkyesno fsck_y_enable; then - echo "File system preen failed, trying fsck -y." - fsck -y + echo "File system preen failed, trying fsck -y ${fsck_y_flags}" + fsck -y ${fsck_y_flags} case $? in 0) ;;