svn commit: r186678 - head/usr.sbin/mergemaster

[Roman Kurakin]

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
>