On Mon, Apr 23, 2012 at 9:08 PM, Thomas D. Dean <[email protected]> wrote: > >> uname -a > FreeBSD P9X79.tddhome 9.0-STABLE FreeBSD 9.0-STABLE #0: Mon Apr 23 \ > 18:48:29 PDT 2012 [email protected]:/usr/obj/usr/src/sys/GENERIC \ > amd64 > > I updated via cvsup an hour ago. Running 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 > ... > ====================================================================== > > *** Displaying differences between ./etc/motd and installed version: > > --- /etc/motd 2012-04-23 20:54:14.000000000 -0700 > +++ ./etc/motd 2012-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 ?.?.? (UNKNOWN) > > Welcome 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. -- Peter Wemm - [email protected]; [email protected]; [email protected]; 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 _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-amd64 To unsubscribe, send any mail to "[email protected]"
