d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Submitted by:	sam
This commit is contained in:
Doug Barton 2009-01-02 00:37:59 +00:00
parent a740208973
commit e0e184799c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.sbin/mergemaster/mergemaster.sh
View File

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