From owner-svn-src-head@FreeBSD.ORG  Fri Jan  2 00:38:00 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 10BAB106564A;
	Fri,  2 Jan 2009 00:38:00 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F1EF28FC16;
	Fri,  2 Jan 2009 00:37:59 +0000 (UTC)
	(envelope-from dougb@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 n020bx72082925;
	Fri, 2 Jan 2009 00:37:59 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n020bxZG082924;
	Fri, 2 Jan 2009 00:37:59 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200901020037.n020bxZG082924@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 2 Jan 2009 00:37:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186689 - head/usr.sbin/mergemaster
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jan 2009 00:38:00 -0000

Author: dougb
Date: Fri Jan  2 00:37:59 2009
New Revision: 186689
URL: http://svn.freebsd.org/changeset/base/186689

Log:
  Only check for 'nodev' in fstab if that file exists
  
  Submitted by:	sam

Modified:
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Fri Jan  2 00:02:14 2009	(r186688)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Fri Jan  2 00:37:59 2009	(r186689)
@@ -353,14 +353,16 @@ case "${AUTO_UPGRADE}" in
   ;;
 esac
 
-if grep -q nodev ${DESTDIR}/etc/fstab; then
-  echo ''
-  echo "*** You have the deprecated 'nodev' option in ${DESTDIR}/etc/fstab."
-  echo "    This can prevent your system from mounting the filesystem on reboot."
-  echo "    Please update your fstab before continuing."
-  echo "    See fstab(5) for more information."
-  echo ''
-  exit 1
+if [ -e "${DESTDIR}/etc/fstab" ]; then
+  if grep -q nodev ${DESTDIR}/etc/fstab; then
+    echo ''
+    echo "*** You have the deprecated 'nodev' option in ${DESTDIR}/etc/fstab."
+    echo "    This can prevent the filesystem from being mounted on reboot."
+    echo "    Please update your fstab before continuing."
+    echo "    See fstab(5) for more information."
+    echo ''
+    exit 1
+  fi
 fi
 
 echo ''