Date: Mon, 23 Apr 2012 21:21:21 -0700 From: Peter Wemm <peter@wemm.org> To: "Thomas D. Dean" <tomdean@speakeasy.org> Cc: freebsd-amd64@freebsd.org Subject: Re: Updating messed up motd Message-ID: <CAGE5yCrLCeE=njeNGxq366E0W00FOo3t-eJ27ftqQHNoFT82gA@mail.gmail.com> In-Reply-To: <4F962755.3080402@speakeasy.org> References: <4F962755.3080402@speakeasy.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Apr 23, 2012 at 9:08 PM, Thomas D. Dean <tomdean@speakeasy.org> wro= te: > >> uname -a > FreeBSD P9X79.tddhome 9.0-STABLE FreeBSD 9.0-STABLE #0: Mon Apr 23 \ > 18:48:29 PDT 2012 =A0 =A0 root@P9X79.tddhome:/usr/obj/usr/src/sys/GENERIC= =A0\ > amd64 > > I updated via cvsup an hour ago. =A0Running mergemaster shows a loss of > version in /etc/motd. > >> env -i make buildworld > ... >> env -i make kernel > ... >> reboot >> mergemaster -p > ... >> make installworld > ... >> make delete-old > ... >> mergemaster -i -F > ... > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > > =A0*** Displaying differences between ./etc/motd and installed version: > > --- /etc/motd =A0 2012-04-23 20:54:14.000000000 -0700 > +++ ./etc/motd =A02012-04-23 21:01:48.000000000 -0700 > @@ -1,4 +1,4 @@ > -FreeBSD 9.0-STABLE (GENERIC) #0: Mon Apr 23 18:48:29 PDT 2012 > +FreeBSD ?.?.? =A0(UNKNOWN) > > =A0Welcome to FreeBSD! > ... > > all else seems OK. Mergemaster is pretty bone-headed about files like motd. For what its worth, the tag line on motd is updated by the /etc/rc.d/motd file. Normally you'd just ignore or skip the file in mergemaster. --=20 Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com; KI6FJV "All of this is for nothing if we don't go to the stars" - JMS/B5 "If Java had true garbage collection, most programs would delete themselves upon execution." -- Robert Sewell
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGE5yCrLCeE=njeNGxq366E0W00FOo3t-eJ27ftqQHNoFT82gA>