Bug #1677

adjust default loader location in boot2

Added by Johannes.Hofmann over 6 years ago. Updated over 6 years ago.

Status:ClosedStart date:
Priority:NormalDue date:
Assignee:-% Done:


Target version:-


adjust the default location where boot2 looks for loader to match the
new default setups with a separate /boot partition.
With this patch it is possible again to just keep hitting <Enter> to
speed up booting.


diff --git a/sys/boot/pc32/boot2/boot2.c b/sys/boot/pc32/boot2/boot2.c
index 775c6bd..b36601b 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 partition */
+#define PATH_BOOT3_ALT "/boot/loader" /* /boot in root */
#define PATH_KERNEL "/kernel"

#define NDEV 3


#1 Updated by thomas.nikolajsen over 6 years ago

patch applied in commit 3735e368a1bdbe773c79c34512f49c905ff77bd7

Also available in: Atom PDF