From 6ef3c2bc3c089fe782262f6d8f1d5fed5f0802e3 Mon Sep 17 00:00:00 2001 From: deadwood Date: Sat, 26 Oct 2013 19:28:52 +0000 Subject: [PATCH] dosboot.resource: move the initial device selection after partion scan This allows to use partition name with bootdevice parameter as well as allows bootmenu to visualize the true selected or default boot device upfront. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@48326 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- rom/dosboot/dosboot_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rom/dosboot/dosboot_init.c b/rom/dosboot/dosboot_init.c index 8e9ae40153..0a9c8899e5 100644 --- a/rom/dosboot/dosboot_init.c +++ b/rom/dosboot/dosboot_init.c @@ -139,7 +139,6 @@ int dosboot_Init(LIBBASETYPEPTR LIBBASE) else if (0 == strnicmp(node->ln_Name, "bootdevice=", 11)) { LIBBASE->db_BootDevice = &node->ln_Name[11]; - selectBootDevice(LIBBASE); } else if (0 == stricmp(node->ln_Name, "econsole")) { @@ -154,6 +153,9 @@ int dosboot_Init(LIBBASETYPEPTR LIBBASE) /* Scan for any additional partition volumes */ dosboot_BootScan(LIBBASE); + /* Select the initial boot device, so that the choice is available in the menu */ + selectBootDevice(LIBBASE); + /* Show the boot menu if needed */ bootmenu_Init(LIBBASE, WantBootMenu); -- 2.11.4.GIT