freebsd stable - Nov 2004 - mergemaster

Hi,

I am upgrading by freebsd installation. While doing mergemaster, it 
didn't ask me whether it should overwrite my /etc/motd file.

Is manual backing up of /etc/motd the only option or have I missed 
something in mergemaster ?


Tejas Kokje
University of Southern California

On Wed, Nov 24, 2004 at 11:30:24AM -0800, Tejas Kokje
wrote:
> I am upgrading by freebsd installation. While doing mergemaster, it 
> didn't ask me whether it should overwrite my /etc/motd file.
> 
> Is manual backing up of /etc/motd the only option or have I missed 
> something in mergemaster ?
By default, mergemaster will always ask about /etc/motd.  If you set the
IGNORE_MOTD=yes 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url :
http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20041124/457338ed/attachment.bin

On Wed, Nov 24, 2004 at 11:30:24AM -0800, Tejas Kokje
wrote:
> 
> I am upgrading by freebsd installation. While doing mergemaster, it 
> didn't ask me whether it should overwrite my /etc/motd file.
> 
> Is manual backing up of /etc/motd the only option or have I missed 
> something in mergemaster ?
You should consider using my patched mergemaster which supports RCS
on every file that it patches (check the archives).  And before
anyone suggests sending a PR, I have exchanged email with the
maintainer of mergemaster and he is not interested in incorporating
the changes.

/\/\ \/\/