[BugFix] root redirect failed to match the peoper drive when internal drive is missing
HAVE_MULTIVOLUME is a subset of HAVE_MULTIDRIVE in normal circumstances they are interchangable but when the internal drive is not found the assumption falls apart at the moment most of the bootloader are less selective about what drives/volumes they will mount therefore the volume might not match between what the bootloader returns for multiboot and what the firmware sees updating bootloaders will fix this but it should probably be made more robust at the same time Change-Id: I93acd4a539894f093211b74b030df3b2c6a0aa11
This commit is contained in:
parent
992455dc58
commit
f37ebe5ed2
1 changed files with 6 additions and 0 deletions
|
@ -150,7 +150,13 @@ static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
|
|||
/* we need to mount the drive before we can access it */
|
||||
root_mount_path(path, 0); /* root could be different folder don't hide */
|
||||
|
||||
/*BUGFIX bootloader is less selective about which drives it will mount -- revisit */
|
||||
#if defined(HAVE_MULTIDRIVE) && (NUM_VOLUMES_PER_DRIVE == 1)
|
||||
if (volume_drive(volume) == boot_data.boot_volume
|
||||
|| volume == boot_data.boot_volume)
|
||||
#else
|
||||
if (volume == boot_data.boot_volume) /* boot volume contained in uint8_t payload */
|
||||
#endif
|
||||
{
|
||||
int rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "");
|
||||
while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH)
|
||||
|
|
Loading…
Reference in a new issue