mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

Make mergemaster ignore files in /dev if /dev is a devfs.

Browse Source 
Approved by:	Doug Barton <Doug@gorean.org>
This commit is contained in:
Ben Smithurst 2000-08-26 12:15:24 +00:00
parent 64ec80423e
commit cf8728a497
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65115
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@
# $FreeBSD$
PATH=/bin:/usr/bin:/usr/sbin
PATH=/bin:/usr/bin:/usr/sbin:/sbin
display_usage () {
VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
@ -422,6 +422,11 @@ case "${RERUN}" in
;;
esac
# Avoid trying to update MAKEDEV if /dev is on a devfs
if mount | grep -q "devfs on /dev "; then
rm ${TEMPROOT}/dev/MAKEDEV ${TEMPROOT}/dev/MAKEDEV.local
fi
;; # End of the "RERUN" test
esac