summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2009-01-02 00:37:59 +0000
committerdougb <dougb@FreeBSD.org>2009-01-02 00:37:59 +0000
commit964611a3050b11c026667dbb4ae98380fe18252a (patch)
treec537c866e8b88380c9d080481ea39f03e64d7afa /usr.sbin
parent23026218b1e51c86798706acd1270c61b4ed1668 (diff)
downloadFreeBSD-src-964611a3050b11c026667dbb4ae98380fe18252a.zip
FreeBSD-src-964611a3050b11c026667dbb4ae98380fe18252a.tar.gz
Only check for 'nodev' in fstab if that file exists
Submitted by: sam
Diffstat (limited to 'usr.sbin')
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh18
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 ''
OpenPOWER on IntegriCloud