diff options
| author | des <des@FreeBSD.org> | 2011-10-18 09:46:52 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2011-10-18 09:46:52 +0000 |
| commit | 6bf8732384c631c3e2f349f2595f5c901f8d6607 (patch) | |
| tree | 816455ef2545ce8d057e9e4ca96ff15f13023d44 /sys/boot/i386/boot2/boot2.c | |
| parent | 4ebe5d8b072978c7ea2953300ec756f400ff2387 (diff) | |
| download | FreeBSD-src-6bf8732384c631c3e2f349f2595f5c901f8d6607.zip FreeBSD-src-6bf8732384c631c3e2f349f2595f5c901f8d6607.tar.gz | |
Look for /boot/config in addition to /boot.config, with the former taking
precedence over the latter if it exists.
MFC after: 3 weeks
Diffstat (limited to 'sys/boot/i386/boot2/boot2.c')
| -rw-r--r-- | sys/boot/i386/boot2/boot2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 93fd839..4d1a2a0 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -75,7 +75,8 @@ __FBSDID("$FreeBSD$"); OPT_SET(RBX_GDB ) | OPT_SET(RBX_MUTE) | \ OPT_SET(RBX_PAUSE) | OPT_SET(RBX_DUAL)) -#define PATH_CONFIG "/boot.config" +#define PATH_DOTCONFIG "/boot.config" +#define PATH_CONFIG "/boot/config" #define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/boot/kernel/kernel" @@ -241,7 +242,8 @@ main(void) autoboot = 1; - if ((ino = lookup(PATH_CONFIG))) + if ((ino = lookup(PATH_CONFIG)) || + (ino = lookup(PATH_DOTCONFIG))) fsread(ino, cmd, sizeof(cmd)); if (*cmd) { |
