From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 18 Feb 2010 23:39:01 +0000 (-0800)
Subject: boot - Switch boot2 loader path around
X-Git-Tag: v2.7.0~175
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/3735e368a1bdbe773c79c34512f49c905ff77bd7

boot - Switch boot2 loader path around

* 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>
---

diff --git a/sys/boot/pc32/boot2/boot2.c b/sys/boot/pc32/boot2/boot2.c
index 775c6bddc0..459436f8d9 100644
--- a/sys/boot/pc32/boot2/boot2.c
+++ b/sys/boot/pc32/boot2/boot2.c
@@ -104,8 +104,8 @@
 #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