From owner-svn-src-head@FreeBSD.ORG  Fri Jan  2 00:31:27 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 3BC801065672;
	Fri,  2 Jan 2009 00:31:27 +0000 (UTC) (envelope-from rik@inse.ru)
Received: from mail.inse.ru (mail.inse.ru [144.206.128.1])
	by mx1.freebsd.org (Postfix) with ESMTP id E25638FC14;
	Fri,  2 Jan 2009 00:31:26 +0000 (UTC) (envelope-from rik@inse.ru)
Received: from www.inse.ru (www.inse.ru [144.206.128.1])
	by mail.inse.ru (Postfix) with ESMTPSA id 94D1B33C51;
	Fri,  2 Jan 2009 03:31:25 +0300 (MSK)
Message-ID: <495D6085.5070206@localhost.inse.ru>
Date: Fri, 02 Jan 2009 03:32:05 +0300
From: Roman Kurakin <rik@inse.ru>
User-Agent: Thunderbird 2.0.0.16 (X11/20080723)
MIME-Version: 1.0
To: Sam Leffler <sam@freebsd.org>
References: <200901011141.n01BfDqj054333@svn.freebsd.org>
	<495D5ECE.6000500@freebsd.org>
In-Reply-To: <495D5ECE.6000500@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
	Doug Barton <dougb@freebsd.org>, src-committers@freebsd.org
Subject: Re: svn commit: r186678 - 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:31:27 -0000

Sam Leffler wrote:
> Doug Barton wrote:
>>   2. Check for the deprecated 'nodev' option in /etc/fstab [3]
>>   
>
> mergemaster now prints:
>
> grep: /data/freebsd/roots/gateworks/etc/fstab: No such file or directory
>
> I suspect it's the above change.  Unfortunately you committed a bunch 
> of unrelated changes en masse so I am guessing.
I guess this is this one part of the patch:

+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
 fi

rik
>
>    Sam
>