Only check for 'nodev' in fstab if that file exists

Submitted by:	sam

1 files changed, 10 insertions, 8 deletions

diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 00f4bde..3f9930d 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -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 ''