Date: Wed, 23 Aug 2000 11:53:59 -0700 (PDT) From: Doug Barton <Doug@gorean.org> To: Ben Smithurst <ben@FreeBSD.org> Cc: current@FreeBSD.org Subject: Re: patch for mergemaster when /dev is devfs Message-ID: <Pine.BSF.4.21.0008231151190.7876-100000@dt051n1f.san.rr.com> In-Reply-To: <20000823172233.I20036@strontium.scientia.demon.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, 23 Aug 2000, Ben Smithurst wrote:
> 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.
I like this approach better, since it doesn't seem that an option
is really necessary. However my understanding of devfs is limited to the
concept only, so if someone more knoweledgeable and/or preferably someone
USING the new devfs stuff wants to comment, I'm open to
suggestions. Otherwise, Ben go ahead and commit this after a few days have
gone by without opinions to the contrary.
Thanks,
Doug
> 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
>
>
--
"Live free or die"
- State motto of my ancestral homeland, New Hampshire
Do YOU Yahoo!?
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0008231151190.7876-100000>