Subject: install/24995: version is empty on sysinst
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <hira@po6.nsk.ne.jp>
List: netbsd-bugs
Date: 04/01/2004 00:19:47
>Number:         24995
>Category:       install
>Synopsis:       version is empty on sysinst
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    install-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 31 15:20:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Kouichirou Hiratsuka
>Release:        NetBSD 2.0_BETA
>Organization:
>Environment:
System: NetBSD firefly.localdomain 2.0_BETA NetBSD 2.0_BETA (FIREFLY.MP) #0: Tue Mar 30 21:56:42 JST 2004 root@firefly.localdomain:/usr/src/sys/arch/i386/compile/FIREFLY.MP i386
Architecture: i386
Machine: i386
>Description:
	The version is empty on sysinst. Today I created a release.
	When I boot from it, sysinst shows `NetBSD- Install System'.
	It should be `NetBSD-2.0_BETA Install System'.

>How-To-Repeat:
	install the NetBSD system

>Fix:
	use ${DISTRIBVER} instead of ${VER}?

Index: Makefile.inc
===================================================================
RCS file: /cvs/cvsroot/src/distrib/utils/sysinst/Makefile.inc,v
retrieving revision 1.34
diff -u -r1.34 Makefile.inc
--- Makefile.inc	29 Feb 2004 18:46:43 -0000	1.34
+++ Makefile.inc	31 Mar 2004 14:47:24 -0000
@@ -94,18 +94,18 @@
 
 msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch
 	${_MKTARGET_CREATE}
-	sed "s/@@VERSION@@/${VER}/" ${.ALLSRC} | \
+	sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
 	awk -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
 
 menus.def: menus.mi ${MENUS_MD} msgtouch
 	${_MKTARGET_CREATE}
-	sed "s/@@VERSION@@/${VER}/" ${.ALLSRC} | \
+	sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \
 	awk -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET}
 
 .for LANG in ${LANGUAGES:N${SYSINSTLANG}}
 sysinstmsgs.${LANG}: msg.mi.${LANG} ${MSG_MD:S/.${SYSINSTLANG}$/.${LANG}/} msgtouch msg_defs.h
 	${_MKTARGET_CREATE}
-	sed "s/@@VERSION@@/${VER}/" ${.ALLSRC:M*.${LANG}} | \
+	sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC:M*.${LANG}} | \
 	awk -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \
 	${HOST_SH} ${MSG_XLAT_SH} > ${.TARGET}
 
>Release-Note:
>Audit-Trail:
>Unformatted: