From owner-freebsd-doc Sun Aug 6 6:33:15 2000 Delivered-To: freebsd-doc@freebsd.org Received: from cfdnet.me.tuns.ca (CFDnet.me.TUNS.Ca [134.190.50.164]) by hub.freebsd.org (Postfix) with ESMTP id 8D5E237BB3E for ; Sun, 6 Aug 2000 06:33:12 -0700 (PDT) (envelope-from bbmail@cfdnet.me.tuns.ca) Received: from localhost (bbmail@localhost) by cfdnet.me.tuns.ca (8.9.3/8.9.3) with ESMTP id KAA15018; Sun, 6 Aug 2000 10:33:08 -0300 (ADT) (envelope-from bbmail@cfdnet.me.tuns.ca) Date: Sun, 6 Aug 2000 10:33:08 -0300 (ADT) From: Bryan Bursey To: Thomas Bader Cc: freebsd-doc@freebsd.org Subject: Re: Chapter ``18.4.7. Update /etc'' in the handbook In-Reply-To: <20000806152439.A18638@trash.net> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=X-UNKNOWN Content-Transfer-Encoding: QUOTED-PRINTABLE Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Hi Thomas. Have you looked at 'mergemaster' which is basically just a shell script included in the base system which walks you through the updating of /etc (checking the diffs and asking the user if (s)he's like to install the file, delete the file, or merge this new file and the existing one. 'mergemaster' also runs 'sh /dev/MAKEDEV all' to remake all your devices. I believe this script is now the supported method of keeping things up to date after a 'make world'. Its mentioned in /usr/src/UPDATING, but I'm not sure if its in the beloved FreeBSD Handbook. Regards, Bryan On Sun, 6 Aug 2000, Thomas Bader wrote: > Hi! >=20 > To merge the new /etc-files, I did the following: >=20 > cp -Rp /etc /etc.old > mkdir /var/tmp/root > cd /usr/src/etc > make DESTDIR=3D/var/tmp/root distrib-dirs distribution > cd /var/tmp/root > diff -r etc /etc | less >=20 > This way I can see, which files have changed and I can copy > or merge them to /etc. This is much easier then making a > timestamp in /var/tmp/root every time a "make world" is > performed and one can do this even if he has not did it > before and therefore has no /var/tmp/root with a timestamp. > And, finally, it is much easier then do a diff for each file > manually. >=20 > Couldn't be that mentioned in the handbook? >=20 > Thomas > --=20 > .-. Thomas Bader =B7 thomasb@trash.net.remove =B7 http://www.t-bader.= ch/ .-. > oo| = oo| > /`'\ Einen Unix-Shellaccount gibt es unter http://www.trash.net/ = /`'\ > (\_;/) PGP Key-ID: 0x3A4B7F5D (RSA) 0x7584F5D8 (DSA/EG) (= \_;/) >=20 >=20 > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-doc" in the body of the message >=20 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message