For some reason the HFS+ code will ignore the startup folder chosen by the user and force the OS 9 startup folder if it exists. This can break OS X installations with Classic, making it impossible to boot back into the OS.
Removing the code to force the use of the OS 9 startup folder allows switching the startup disk between OS 9/OS X using the Disk Startup Utility in each OS as expected.
Signed-off-by: Mark Cave-Ayland mark.cave-ayland@ilande.co.uk --- fs/hfsplus/hfsp_fs.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/fs/hfsplus/hfsp_fs.c b/fs/hfsplus/hfsp_fs.c index df234bb..4d52478 100644 --- a/fs/hfsplus/hfsp_fs.c +++ b/fs/hfsplus/hfsp_fs.c @@ -233,8 +233,6 @@ hfsp_files_open( hfsp_info_t *mi ) int *p = (int*)&(mi->vol)->vol.finder_info[0]; int cnid = p[0]; /* printk(" p[0] = %x, p[3] = %x, p[5] = %x\n", p[0], p[3], p[5] ); */ - if( p[0] == p[5] && p[3] ) - cnid = p[3]; if( record_init_cnid(&(mi->hfspfile->rec), &(mi->vol)->catalog, cnid) ) RET ( 0 ); path += 2;