From 7251f5d1dd3eab1d5d13a33d910d32897395819e Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 13 May 2013 11:07:45 +1000 Subject: [PATCH] Fix disk-label package to use proper instance path This fixes booting from a path that has an explicitly specified unit address on a wildcard node Signed-off-by: Benjamin Herrenschmidt --- slof/fs/packages/disk-label.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/slof/fs/packages/disk-label.fs b/slof/fs/packages/disk-label.fs index 2dc581b..57167e5 100644 --- a/slof/fs/packages/disk-label.fs +++ b/slof/fs/packages/disk-label.fs @@ -368,7 +368,7 @@ CONSTANT /partition-entry : load-chrp-boot-file ( addr -- size ) \ Create bootinfo.txt path name and load that file: - my-parent ihandle>phandle node>path + my-parent instance>path s" :\ppc\bootinfo.txt" $cat strdup ( addr str len ) open-dev dup 0= IF 2drop 0 EXIT THEN >r dup ( addr addr R:ihandle ) @@ -387,7 +387,7 @@ CONSTANT /partition-entry THEN \ Create the full path to the boot loader: - my-parent ihandle>phandle node>path ( addr fnstr fnlen nstr nlen ) + my-parent instance>path ( addr fnstr fnlen nstr nlen ) s" :" $cat 2swap $cat strdup ( addr str len ) \ Update the bootpath: 2dup encode-string s" bootpath" set-chosen