Make mergemaster ignore files in /dev if /dev is a devfs.
Approved by: Doug Barton <Doug@gorean.org>
This commit is contained in:
parent
64ec80423e
commit
cf8728a497
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=65115
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user