r138 - in openbios-devel: arch/sparc32 forth/admin

Author: blueswirl
Date: 2007-05-04 22:55:05 +0200 (Fri, 04 May 2007)
New Revision: 138

Modified:
   openbios-devel/arch/sparc32/boot.c
   openbios-devel/forth/admin/nvram.fs
Log:
Fix boot-device use

Modified: openbios-devel/arch/sparc32/boot.c
===================================================================
--- openbios-devel/arch/sparc32/boot.c	2007-05-01 14:14:17 UTC (rev 137)
+++ openbios-devel/arch/sparc32/boot.c	2007-05-04 20:55:05 UTC (rev 138)
@@ -28,7 +28,7 @@
 
 void boot(void)
 {
-        char *path = pop_fstr_copy(), *param, *oldpath;
+        char *path = pop_fstr_copy(), *param, *oldpath = path;
         char altpath[256];
         int unit;
         const void *romvec;
@@ -41,7 +41,6 @@
             fword("get-package-property");
             if (!POP()) {
                 path = pop_fstr_copy();
-                oldpath = path;
                 unit = 0;
             } else {
                 switch (boot_device) {

Modified: openbios-devel/forth/admin/nvram.fs
===================================================================
--- openbios-devel/forth/admin/nvram.fs	2007-05-01 14:14:17 UTC (rev 137)
+++ openbios-devel/forth/admin/nvram.fs	2007-05-04 20:55:05 UTC (rev 138)
@@ -303,7 +303,6 @@
 \ fcode-debug? input-device output-device
 " true"     " auto-boot?"           bool-config   \ 7.4.3.5
 " boot"     " boot-command"         str-config    \ 7.4.3.5
-" disk"     " boot-device"          str-config    \ 7.4.3.5
 " "         " boot-file"            str-config    \ 7.4.3.5
 " false"    " diag-switch?"         bool-config   \ 7.4.3.5
 " net"      " diag-device"          str-config    \ 7.4.3.5
@@ -330,6 +329,7 @@
 
 [IFDEF] CONFIG_PPC
 \ ---- PPC ----
+" disk"     " boot-device"          str-config    \ 7.4.3.5
 " false"    " little-endian?"       bool-config
 " false"    " real-mode?"           bool-config
 " -1"       " real-base"            int-config
@@ -341,6 +341,7 @@
 
 [IFDEF] CONFIG_X86
 \ ---- X86 ----
+" disk"     " boot-device"          str-config    \ 7.4.3.5
 " true"     " little-endian?"       bool-config
 [THEN]