From owner-freebsd-bugs  Wed Jun 26 19: 6:33 2002
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id E575C37C06D
	for <freebsd-bugs@hub.freebsd.org>; Wed, 26 Jun 2002 19:00:06 -0700 (PDT)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5R206JU006601
	for <freebsd-bugs@freefall.freebsd.org>; Wed, 26 Jun 2002 19:00:06 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5R206ig006600;
	Wed, 26 Jun 2002 19:00:06 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by hub.freebsd.org (Postfix) with ESMTP id 6365E37E6BE
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 26 Jun 2002 18:55:56 -0700 (PDT)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g5R1tuOT096313
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 26 Jun 2002 18:55:56 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.4/8.12.4/Submit) id g5R1tupP096312;
	Wed, 26 Jun 2002 18:55:56 -0700 (PDT)
Message-Id: <200206270155.g5R1tupP096312@www.freebsd.org>
Date: Wed, 26 Jun 2002 18:55:56 -0700 (PDT)
From: Ash Garg <ash@telstra.net>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: misc/39908: releaseName env variable not reference in install.c
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         39908
>Category:       misc
>Synopsis:       releaseName env variable not reference in install.c
>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:   Wed Jun 26 19:00:06 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Ash Garg
>Release:        4.5
>Organization:
Telstra
>Environment:
FreeBSD Pluto.telstra.net 4.5-RELEASE-p5 FreeBSD 4.5-RELEASE-p5 #0: Wed May 29 14:06:20 EST 2002     agarg@Pluto.telstra.net:/usr/obj/usr/src/sys/PLUTO  i386

>Description:
The environment varible releaseName or VAR_RELNAME is not used to get the Release Name when running in the interactive mode even though it has been set. The kern.osrelease is used always.
>How-To-Repeat:
     
>Fix:
Modify the function static char* getRelname(void) in /usr/src/release/sysinstall/install.c to check if the environment variable exists and if it does, then use it.

Original Function
-----------------
static char *
getRelname(void)
{
    static char buf[64];
    int sz = (sizeof buf) - 1;
   
    if (sysctlbyname("kern.osrelease", buf, &sz, NULL, 0) != -1) {
        buf[sz] = '\0';
        return buf;
    }
    else
        return "<unknown>";
        }
}

Modified Function
-----------------static char *
getRelname(void)
{
    static char buf[64];
    int sz = (sizeof buf) - 1;
    
        /* Ash's Mods  Start */
        char* rel;
     
        rel=variable_get(VAR_RELNAME);
        if(rel==NULL)
        {
          /* Mods Finish */
    if (sysctlbyname("kern.osrelease", buf, &sz, NULL, 0) != -1) {
        buf[sz] = '\0';
        return buf;
    }
    else
        return "<unknown>";
        }
        /* Mods Start */
        else
        {
                return rel;
        }
        /* Mods Stop */
}



>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message