Date: Sun, 13 Oct 2002 15:55:09 -0700 From: "Crist J. Clark" <crist.clark@attbi.com> To: Matthew Dillon <dillon@apollo.backplane.com> Cc: Trish Lynch <trish@bsdunix.net>, Adrian Wontroba <aw1@stade.co.uk>, chris scott <c.scott@uk.tiscali.com>, freebsd-stable@FreeBSD.ORG Subject: Re: Ifconfig config of gif tunnels Message-ID: <20021013225509.GA90575@blossom.cjclark.org> In-Reply-To: <200210132154.g9DLsUmc057065@apollo.backplane.com> References: <20021013172810.A19177@titus.hanley.stade.co.uk> <20021013130138.G523-100000@femme.sapphite.org> <20021013214642.GB90169@blossom.cjclark.org> <200210132154.g9DLsUmc057065@apollo.backplane.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Oct 13, 2002 at 02:54:30PM -0700, Matthew Dillon wrote:
>
> :Ewww. That kind of defeats the whole purpose of mergemaster(8). The
> :whole idea is for a human to sit at the console and decide what
> :changes need to be made. With your system, you'll lose any changes to
> :master.passwd or group (like the recent addition of the sshd
> :user/group). (Although I'll admit that changing the hosts file is one
> :that I wouldn't mind skipping everytime.) You might as well just copy
> :your files out of the way, run the make commands mergemaster(8) does,
> :and then move the files back. Mergemaster(8) doesn't really buy you
> :anything the way you are using it.
> :
> :Actually, you probably really should be using the '-a' option to
> :mergemaster(8), and then go back later to see what else you need to
> :update.
> :--
> :Crist J. Clark | cjclark@alum.mit.edu
>
> I would like mergemaster a whole lot more if:
>
> (1) It just overwrote system files that users are not supposed to
> change anyway, like files in /etc/defaults and the /etc/rc*
> files.
I've always felt lists of "default clobbers" and "default skips" would
be nice to have.
> (2) It cleared the window before each presentation, so I don't
> have to search around the window to find the filename and/or
> diff that it's currently asking me to do something about
> (this is especially annoying for small files).
How 'bout,
Index: mergemaster.sh
===================================================================
RCS file: /export/freebsd/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.37
diff -u -r1.37 mergemaster.sh
--- mergemaster.sh 5 Aug 2002 08:47:52 -0000 1.37
+++ mergemaster.sh 13 Oct 2002 22:52:50 -0000
@@ -111,9 +111,7 @@
"${HANDLE_COMPFILE}" = "NOT V" ]; do
if [ -f "${DESTDIR}${COMPFILE#.}" -a -f "${COMPFILE}" ]; then
if [ "${HANDLE_COMPFILE}" = "v" -o "${HANDLE_COMPFILE}" = "V" ]; then
- echo ''
- echo ' ====================================================================== '
- echo ''
+ clear
(
echo ''
echo " *** Displaying differences between ${COMPFILE} and installed version:"
> (3) It didn't try to display the whole diff initially, causing
> a pipe-to-(less or more) that I then have to quit out of
> before I can tell it to install / delete. Blech.
What would you like it to do here? Nothing better leaps to my
mind. Having to do something to see the diff seems even more annoying
to me.
--
Crist J. Clark | cjclark@alum.mit.edu
| cjclark@jhu.edu
http://people.freebsd.org/~cjc/ | cjc@freebsd.org
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021013225509.GA90575>