From owner-freebsd-current Wed Aug 23 9:44:52 2000 Delivered-To: freebsd-current@freebsd.org Received: from scientia.demon.co.uk (scientia.demon.co.uk [212.228.14.13]) by hub.freebsd.org (Postfix) with ESMTP id C8C1137B43E for ; Wed, 23 Aug 2000 09:44:41 -0700 (PDT) Received: from strontium.scientia.demon.co.uk ([192.168.91.36] ident=root) by scientia.demon.co.uk with esmtp (Exim 3.16 #1) id 13RdIQ-000IJc-00; Wed, 23 Aug 2000 17:22:34 +0100 Received: (from ben@localhost) by strontium.scientia.demon.co.uk (8.9.3/8.9.3) id RAA76718; Wed, 23 Aug 2000 17:22:33 +0100 (BST) (envelope-from ben) Date: Wed, 23 Aug 2000 17:22:33 +0100 From: Ben Smithurst To: Doug Barton , current@FreeBSD.org Subject: patch for mergemaster when /dev is devfs Message-ID: <20000823172233.I20036@strontium.scientia.demon.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2i Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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 / ben@FreeBSD.org / PGP: 0x99392F7D To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message