From owner-freebsd-stable@FreeBSD.ORG Wed Nov 24 19:38:38 2004 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 162E316A4CE for ; Wed, 24 Nov 2004 19:38:38 +0000 (GMT) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9467C43D45 for ; Wed, 24 Nov 2004 19:38:37 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id iAOJd14r027530; Wed, 24 Nov 2004 11:39:01 -0800 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id iAOJd1H8027529; Wed, 24 Nov 2004 11:39:01 -0800 Date: Wed, 24 Nov 2004 11:39:01 -0800 From: Brooks Davis To: Tejas Kokje Message-ID: <20041124193901.GA24353@odin.ac.hmc.edu> References: <41A4E150.4050304@ISI.EDU> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="oyUTqETQ0mS9luUI" Content-Disposition: inline In-Reply-To: <41A4E150.4050304@ISI.EDU> User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu cc: freebsd-stable@freebsd.org Subject: Re: mergemaster X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2004 19:38:38 -0000 --oyUTqETQ0mS9luUI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 24, 2004 at 11:30:24AM -0800, Tejas Kokje wrote: > I am upgrading by freebsd installation. While doing mergemaster, it=20 > didn't ask me whether it should overwrite my /etc/motd file. >=20 > Is manual backing up of /etc/motd the only option or have I missed=20 > something in mergemaster ? By default, mergemaster will always ask about /etc/motd. If you set the IGNORE_MOTD=3Dyes config option then /etc/motd will be ignored entierly (IMO, this should be the default). If it is in fact being over written without a prompt that is a bug since mergemaster is specificaly supposed to avoid overwritting anything without user intervention. It's possiable you have an MM_PRE_COMPARE_SCRIPT that is doing it for you if someone else configurd the machine. -- Brooks -- Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --oyUTqETQ0mS9luUI Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFBpONUXY6L6fI4GtQRAl3qAKDYzRLUiMbvqVQTxbd9xX7Sy2ObJgCgvg3N AWzOR1SbwBAu0LDp8Nsv1Us= =wt6c -----END PGP SIGNATURE----- --oyUTqETQ0mS9luUI--