Just a minor point...
Should we add a patch something like this to mergemaster so that it
doesn't prompt the user about MAKEDEV if their /dev is a devfs where
MAKEDEV can't be created anyway?
Or would you prefer that this be made an option like IGNORE_DEV or
IGNORE_MAKEDEV or something? If you'd prefer that I can probably create
an appropriate patch, but this route seems more sensible to me, since no
config change will be needed if I decide to stop using devfs.
Index: mergemaster.sh
===================================================================
RCS file: /usr/cvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.10
diff -u -r1.10 mergemaster.sh
--- mergemaster.sh 2000/08/13 19:32:19 1.10
+++ mergemaster.sh 2000/08/23 16:17:48
@@ -10,7 +10,7 @@
# $FreeBSD: src/usr.sbin/mergemaster/mergemaster.sh,v 1.10 2000/08/13 19:32:19
gshapiro Exp $
-PATH=/bin:/usr/bin:/usr/sbin
+PATH=/bin:/usr/bin:/usr/sbin:/sbin
display_usage () {
VERSION_NUMBER=`grep "[$]FreeBSD:" $0 | cut -d ' ' -f 4`
@@ -421,6 +421,11 @@
*) rm ${TEMPROOT}/etc/motd
;;
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
--
Ben Smithurst / [EMAIL PROTECTED] / PGP: 0x99392F7D
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message
