2 files changed, 21 insertions, 9 deletions

diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h
index ddd86c6d86..d7314cf3b1 100644
--- a/firmware/include/dircache_redirect.h
+++ b/firmware/include/dircache_redirect.h
@@ -24,6 +24,7 @@
 #include "pathfuncs.h"
 #include "dir.h"
 #include "dircache.h"
+#include "file.h"
 
 #if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR) && !defined(BOOTLOADER)
 #include "rb-loader.h"
@@ -185,22 +186,33 @@ static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
 
         if (multiboot_is_boot_volume(IF_MV_VOL(volume)))
         {
-            int rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "");
-            while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH)
-                rtpath[rtlen] = '\0'; /* remove extra separators */
+            /* get the full path to the BOOTFILE
+               ie. /<0>/redirectdir/.rockbox/rockbox.ext */
+            int rtlen = get_redirect_dir(rtpath, sizeof(rtpath),
+                                         volume, BOOTDIR, BOOTFILE);
+
+            if (rtlen <= 0 || rtlen >= (int) sizeof(rtpath))
+                rtlen = 0; /* path too long or sprintf error */
+            else if (file_exists(rtpath))
+            {
+                rtlen = get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "");
+                while (rtlen > 0 && rtpath[--rtlen] == PATH_SEPCH)
+                    rtpath[rtlen] = '\0'; /* remove separators */
+            }
+            else
+                rtlen = 0; /* No BOOTFILE found */
 
 #if 0 /*removed, causes issues with playback for now?*/
             if (rtlen <= 0 || rtpath[rtlen] == VOL_END_TOK)
                 root_unmount_volume(volume); /* unmount so root can be hidden*/
 #endif
-            if (rtlen <= 0) /* Error occurred, card removed? Set root to default */
-            {
+            if (rtlen <= 0 || root_mount_path(rtpath, NSITEM_CONTENTS) != 0)
+            {   /* Error occurred, card removed? Set root to default */
+                boot_data_valid = false;
                 root_unmount_volume(volume); /* unmount so root can be hidden*/
                 goto standard_redirect;
             }
-            root_mount_path(rtpath, NSITEM_CONTENTS);
         }
-
     }
     else
     {
diff --git a/firmware/include/disk_cache.h b/firmware/include/disk_cache.h
index 79b2ccf2c6..9787c64aec 100644
--- a/firmware/include/disk_cache.h
+++ b/firmware/include/disk_cache.h
@@ -36,7 +36,7 @@ static inline void dc_unlock_cache(void)
     mutex_unlock(&disk_cache_mutex);
 }
 
-void * dc_cache_probe(IF_MV(int volume,) unsigned long secnum,
+void * dc_cache_probe(IF_MV(int volume,) sector_t secnum,
                       unsigned int *flags);
 void dc_dirty_buf(void *buf);
 void dc_discard_buf(void *buf);
@@ -46,7 +46,7 @@ void dc_discard_all(IF_MV_NONVOID(int volume));
 void dc_init(void) INIT_ATTR;
 
 /* in addition to filling, writeback is implemented by the client */
-extern void dc_writeback_callback(IF_MV(int volume, ) unsigned long sector,
+extern void dc_writeback_callback(IF_MV(int volume, ) sector_t sector,
                                   void *buf);