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/arm | |
| 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/arm')
| -rw-r--r-- | sys/boot/arm/at91/boot2/boot2.c | 6 | ||||
| -rw-r--r-- | sys/boot/arm/ixp425/boot2/boot2.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sys/boot/arm/at91/boot2/boot2.c b/sys/boot/arm/at91/boot2/boot2.c index 9730888..e585ada 100644 --- a/sys/boot/arm/at91/boot2/boot2.c +++ b/sys/boot/arm/at91/boot2/boot2.c @@ -64,7 +64,8 @@ __FBSDID("$FreeBSD$"); OPT_SET(RBX_VERBOSE) | \ OPT_SET(RBX_GDB)) -#define PATH_CONFIG "/boot.config" +#define PATH_DOTCONFIG "/boot.config" +#define PATH_CONFIG "/boot/config" //#define PATH_KERNEL "/boot/kernel/kernel" #define PATH_KERNEL "/boot/kernel/kernel.gz.tramp" @@ -160,7 +161,8 @@ main(void) autoboot = 1; /* Process configuration file */ - if ((ino = lookup(PATH_CONFIG))) + if ((ino = lookup(PATH_CONFIG)) || + (ino = lookup(PATH_DOTCONFIG))) fsread(ino, cmd, sizeof(cmd)); if (*cmd) { diff --git a/sys/boot/arm/ixp425/boot2/boot2.c b/sys/boot/arm/ixp425/boot2/boot2.c index fabfcf6..3d356f0 100644 --- a/sys/boot/arm/ixp425/boot2/boot2.c +++ b/sys/boot/arm/ixp425/boot2/boot2.c @@ -62,7 +62,8 @@ __FBSDID("$FreeBSD$"); OPT_SET(RBX_VERBOSE) | \ OPT_SET(RBX_GDB)) -#define PATH_CONFIG "/boot.config" +#define PATH_DOTCONFIG "/boot.config" +#define PATH_CONFIG "/boot/config" #define PATH_KERNEL "/boot/kernel/kernel" extern uint32_t _end; @@ -168,7 +169,8 @@ main(void) autoboot = 1; /* Process configuration file */ - if ((ino = lookup(PATH_CONFIG))) + if ((ino = lookup(PATH_CONFIG)) || + (ino = lookup(PATH_DOTCONFIG))) fsread(ino, cmd, sizeof(cmd)); if (*cmd) { |
