From owner-freebsd-amd64@FreeBSD.ORG Tue Apr 24 04:21:22 2012 Return-Path: Delivered-To: freebsd-amd64@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3159106566C for ; Tue, 24 Apr 2012 04:21:22 +0000 (UTC) (envelope-from peter@wemm.org) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 611FA8FC08 for ; Tue, 24 Apr 2012 04:21:22 +0000 (UTC) Received: by iahk25 with SMTP id k25so545987iah.13 for ; Mon, 23 Apr 2012 21:21:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wemm.org; s=google; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=qu9/ywWrPvSMLvk5W/QYuvky2zbKBAeakIrmIlZTXyQ=; b=tHl0itUIEn0fQn0nrzax6eb7+erZ8Wh0iWbJcTw+YrWzVcwBZbbsKPpnd5e/32bTZN dWWK8napLWfQIJHxyBkDqb+Q287cYULgFfFDPwiar9yVemAWrh0iaZrL7lm5Kw70zRrG 4EvpoKxa3k/NpxYFYFtbi3h3ovs9IskAxvpes= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding:x-gm-message-state; bh=qu9/ywWrPvSMLvk5W/QYuvky2zbKBAeakIrmIlZTXyQ=; b=cXDCOb+/9WbDCaVFs0fxDa7CJFHE1nqrSxLsSBOtwRbX52lHP9hzaOlnYRVqEukJVD W8qpd2lFjMhXb4OFYLYEFvcynAzPKGwdju3uRzNs3R+3QhO3Pfntu5FwcIOYwy0XbATc fKXr9pGTl4sE9SYx+hCZfzyJpfuNvjGoVh6iu3qYX5kFnTSJJQ3ni7WwS95Hv4UcH1eV KlVo30Y39ZBQgwIf0JdfdpDEHMJR+zCuXM5XXr/X6KDG94xGQuMWgx16Ev/6x5YTwl92 Y6AP2GyfAP8sswsdg0d8sf4R+NFaTwcAb0AGVDPgqiaV0nWCNWRxsDRZcul5kybSTh64 n89w== MIME-Version: 1.0 Received: by 10.50.12.225 with SMTP id b1mr8621555igc.9.1335241281729; Mon, 23 Apr 2012 21:21:21 -0700 (PDT) Received: by 10.231.243.4 with HTTP; Mon, 23 Apr 2012 21:21:21 -0700 (PDT) In-Reply-To: <4F962755.3080402@speakeasy.org> References: <4F962755.3080402@speakeasy.org> Date: Mon, 23 Apr 2012 21:21:21 -0700 Message-ID: From: Peter Wemm To: "Thomas D. Dean" Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Gm-Message-State: ALoCoQk7HqeFAjawMtyPhzBospkI5XzTKwqzwxCgTa8nDqdFfA8Bz8xr5SNthjmuD9rC+Lr9DVCK Cc: freebsd-amd64@freebsd.org Subject: Re: Updating messed up motd X-BeenThere: freebsd-amd64@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting FreeBSD to the AMD64 platform List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Apr 2012 04:21:22 -0000 On Mon, Apr 23, 2012 at 9:08 PM, Thomas D. Dean 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