boot - Switch boot2 loader path around
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 18 Feb 2010 23:39:01 +0000 (15:39 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 18 Feb 2010 23:39:01 +0000 (15:39 -0800)
* Test /loader first, then /boot/loader, makes hitting enter quickly
  to speed up booting work again through the boot2 bootstrap.

Submitted-by: Johannes Hofmann <johannes.hofmann@gmx.de>
sys/boot/pc32/boot2/boot2.c

index 775c6bd..459436f 100644 (file)
 #define RBX_MASK       0x2005ffff
 
 #define PATH_CONFIG    "/boot.config"
-#define PATH_BOOT3     "/boot/loader"          /* /boot in root */
-#define PATH_BOOT3_ALT "/loader"               /* /boot partition */
+#define PATH_BOOT3     "/loader"               /* /boot is dedicated */
+#define PATH_BOOT3_ALT "/boot/loader"          /* /boot in root */
 #define PATH_KERNEL    "/kernel"
 
 #define NDEV           3