summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben <ben@FreeBSD.org>2000-08-26 12:15:24 +0000
committerben <ben@FreeBSD.org>2000-08-26 12:15:24 +0000
commit55b1f4b48e81b1b4d81b8974eaf6ec8722dee29c (patch)
tree404e7bd31320aff815a8c2908619e396ef7014ef
parentfd7a4d0371f45e03c3adc295f9a3ac25fe42ef75 (diff)
downloadFreeBSD-src-55b1f4b48e81b1b4d81b8974eaf6ec8722dee29c.zip
FreeBSD-src-55b1f4b48e81b1b4d81b8974eaf6ec8722dee29c.tar.gz
Make mergemaster ignore files in /dev if /dev is a devfs.
Approved by: Doug Barton <Doug@gorean.org>
-rwxr-xr-xusr.sbin/mergemaster/mergemaster.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 555eede..f31a045 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -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
OpenPOWER on IntegriCloud