commit b9ab27c65aeff96dff080262319d7048ae511d99
author stroese <stroese> Fri Jul 11 08:00:33 2003 +0000
committer stroese <stroese> Fri Jul 11 08:00:33 2003 +0000
tree 45e77842c2120bfad3640eb380a88384caa9fb13
parent 691412860d6030d4f71c239433367c45619a46b5

- Fix bug in CONFIG_VERSION_VARIABLE.

common/cmd_nvedit.c

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index bfc69bd..53df582 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -183,9 +183,6 @@
 		 * ver is readonly.
 		 */
 		if ( (strcmp (name, "serial#") == 0) ||
-#if defined(CONFIG_VERSION_VARIABLE)
-		     (strcmp (name, "ver") == 0) ||
-#endif /* CONFIG_VERSION_VARIABLE */
 		    ((strcmp (name, "ethaddr") == 0)
 #if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
 		     && (strcmp (env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)

common/main.c

diff --git a/common/main.c b/common/main.c
index f7830a1..5ddecca 100644
--- a/common/main.c
+++ b/common/main.c
@@ -284,10 +284,8 @@
 #ifdef CONFIG_VERSION_VARIABLE
 	{
 		extern char version_string[];
-		char *str = getenv("ver");
 
-		if (!str)
-			setenv ("ver", version_string);  /* set version variable */
+		setenv ("ver", version_string);  /* set version variable */
 	}
 #endif /* CONFIG_VERSION_VARIABLE */