From owner-freebsd-bugs@FreeBSD.ORG Sun Dec 2 16:50:01 2007 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4E3C16A418 for ; Sun, 2 Dec 2007 16:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CFB5F13C455 for ; Sun, 2 Dec 2007 16:50:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lB2Go0C0057933 for ; Sun, 2 Dec 2007 16:50:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lB2Go08J057932; Sun, 2 Dec 2007 16:50:00 GMT (envelope-from gnats) Resent-Date: Sun, 2 Dec 2007 16:50:00 GMT Resent-Message-Id: <200712021650.lB2Go08J057932@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Renato Botelho Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9153816A417 for ; Sun, 2 Dec 2007 16:49:48 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 7CB5113C457 for ; Sun, 2 Dec 2007 16:49:48 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id lB2GnWjh010345 for ; Sun, 2 Dec 2007 16:49:32 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id lB2GnWpR010344; Sun, 2 Dec 2007 16:49:32 GMT (envelope-from nobody) Message-Id: <200712021649.lB2GnWpR010344@www.freebsd.org> Date: Sun, 2 Dec 2007 16:49:32 GMT From: Renato Botelho To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/118385: /etc/rc.d/motd doesn't work on custom system X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Dec 2007 16:50:01 -0000 >Number: 118385 >Category: misc >Synopsis: /etc/rc.d/motd doesn't work on custom system >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Dec 02 16:50:00 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: 7.0-BETA3 >Organization: >Environment: FreeBSD localhost 7.0-BETA3 FreeBSD 7.0-BETA3 #1: Sat Dec 1 17:38:41 BRST 2007 root@localhost:/usr/obj/usr/src/sys/GARGA i386 >Description: When you customize Operating System name, /etc/rc.d/motd add a new OS information line at the top of /etc/motd on each new boot. It happens because name "FreeBSD" is harcoded inside it, i've changed it to get OS name using uname command. I don't know if the way i did it is the best, but it's working here. >How-To-Repeat: >Fix: Index: src/etc/rc.d/motd =================================================================== RCS file: /home/ncvs/src/etc/rc.d/motd,v retrieving revision 1.9 diff -u -r1.9 motd --- src/etc/rc.d/motd 7 Oct 2004 13:55:26 -0000 1.9 +++ src/etc/rc.d/motd 2 Dec 2007 16:32:33 -0000 @@ -34,14 +34,16 @@ fi T=`mktemp -t motd` + export __OSNAME=`/usr/bin/uname` uname -v | sed -e 's,^\([^#]*\) #\(.* [1-2][0-9][0-9][0-9]\).*/\([^\]*\) $,\1 (\3) #\2,' > ${T} - awk '{if (NR == 1) {if ($1 == "FreeBSD") {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T} + awk '{if (NR == 1) {if ($1 == ENVIRON["__OSNAME"]) {next} else {print "\n"$0}} else {print}}' < /etc/motd >> ${T} cmp -s $T /etc/motd || { cp $T /etc/motd chmod ${PERMS} /etc/motd } rm -f $T + unset __OSNAME echo . } >Release-Note: >Audit-Trail: >Unformatted: