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

[Doug Barton]

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 ''