From owner-svn-src-stable-8@FreeBSD.ORG  Fri Jun 29 17:28:04 2012
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21FA3106566C;
	Fri, 29 Jun 2012 17:28:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0BFF38FC12;
	Fri, 29 Jun 2012 17:28:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5THS3Nf059369;
	Fri, 29 Jun 2012 17:28:03 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5THS3Vl059366;
	Fri, 29 Jun 2012 17:28:03 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201206291728.q5THS3Vl059366@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 29 Jun 2012 17:28:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237808 - in stable/8/etc/periodic: daily security
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 17:28:04 -0000

Author: jhb
Date: Fri Jun 29 17:28:03 2012
New Revision: 237808
URL: http://svn.freebsd.org/changeset/base/237808

Log:
  MFC 197552:
  Silence warning printed by getfsspec(3) when /etc/fstab does not exist
    fstab: /etc/fstab:0: No such file or directory
  and from dump(8) when setfsent(3) fails due to /etc/fstab not existing:
    DUMP: Can't open /etc/fstab for dump table information: No such...
  
  This makes daily and security periodic runs somewhat cleaner in jails
  which lack /etc/fstab files.

Modified:
  stable/8/etc/periodic/daily/400.status-disks
  stable/8/etc/periodic/security/200.chkmounts
Directory Properties:
  stable/8/etc/   (props changed)

Modified: stable/8/etc/periodic/daily/400.status-disks
==============================================================================
--- stable/8/etc/periodic/daily/400.status-disks	Fri Jun 29 17:26:37 2012	(r237807)
+++ stable/8/etc/periodic/daily/400.status-disks	Fri Jun 29 17:28:03 2012	(r237808)
@@ -19,6 +19,9 @@ case "$daily_status_disks_enable" in
 	df $daily_status_disks_df_flags && rc=1 || rc=3
 
 	# display which filesystems need backing up
+	if ! [ -f /etc/fstab ]; then
+		export PATH_FSTAB=/dev/null
+	fi
 
 	echo ""
 	dump W || rc=3;;

Modified: stable/8/etc/periodic/security/200.chkmounts
==============================================================================
--- stable/8/etc/periodic/security/200.chkmounts	Fri Jun 29 17:26:37 2012	(r237807)
+++ stable/8/etc/periodic/security/200.chkmounts	Fri Jun 29 17:28:03 2012	(r237808)
@@ -50,6 +50,9 @@ case "$daily_status_security_chkmounts_e
 		ignore="${ignore}|^amd:"
 	esac
 	[ -n "$ignore" ] && cmd="egrep -v ${ignore#|}" || cmd=cat
+	if ! [ -f /etc/fstab ]; then
+		export PATH_FSTAB=/dev/null
+	fi
 	mount -p | sort | ${cmd} |
 	  check_diff mount - "${host} changes in mounted filesystems:"
 	rc=$?;;