Author: des
Date: Tue Oct 18 09:46:52 2011
New Revision: 226506
URL: http://svn.freebsd.org/changeset/base/226506
Log:
Look for /boot/config in addition to /boot.config, with the former taking
precedence over the latter if it exists.
MFC after: 3 weeks
Modified:
head/sys/boot/arm/at91/boot2/boot2.c
head/sys/boot/arm/ixp425/boot2/boot2.c
head/sys/boot/i386/boot2/boot2.c
head/sys/boot/i386/gptboot/gptboot.c
head/sys/boot/i386/zfsboot/zfsboot.c
head/sys/boot/pc98/boot2/boot2.c
Modified: head/sys/boot/arm/at91/boot2/boot2.c
==============================================================================
--- head/sys/boot/arm/at91/boot2/boot2.c Tue Oct 18 09:39:41 2011
(r226505)
+++ head/sys/boot/arm/at91/boot2/boot2.c Tue Oct 18 09:46:52 2011
(r226506)
@@ -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) {
Modified: head/sys/boot/arm/ixp425/boot2/boot2.c
==============================================================================
--- head/sys/boot/arm/ixp425/boot2/boot2.c Tue Oct 18 09:39:41 2011
(r226505)
+++ head/sys/boot/arm/ixp425/boot2/boot2.c Tue Oct 18 09:46:52 2011
(r226506)
@@ -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) {
Modified: head/sys/boot/i386/boot2/boot2.c
==============================================================================
--- head/sys/boot/i386/boot2/boot2.c Tue Oct 18 09:39:41 2011
(r226505)
+++ head/sys/boot/i386/boot2/boot2.c Tue Oct 18 09:46:52 2011
(r226506)
@@ -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) {
Modified: head/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- head/sys/boot/i386/gptboot/gptboot.c Tue Oct 18 09:39:41 2011
(r226505)
+++ head/sys/boot/i386/gptboot/gptboot.c Tue Oct 18 09:46:52 2011
(r226506)
@@ -38,7 +38,8 @@ __FBSDID("$FreeBSD$");
#include "cons.h"
#include "gpt.h"
-#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"
@@ -163,8 +164,8 @@ main(void)
for (;;) {
*kname = '\0';
- ino = lookup(PATH_CONFIG);
- if (ino > 0)
+ if ((ino = lookup(PATH_CONFIG)) ||
+ (ino = lookup(PATH_DOTCONFIG)))
fsread(ino, cmd, sizeof(cmd));
if (*cmd != '\0') {
Modified: head/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- head/sys/boot/i386/zfsboot/zfsboot.c Tue Oct 18 09:39:41 2011
(r226505)
+++ head/sys/boot/i386/zfsboot/zfsboot.c Tue Oct 18 09:46:52 2011
(r226506)
@@ -45,7 +45,8 @@ __FBSDID("$FreeBSD$");
/* Hint to loader that we came from ZFS */
#define KARGS_FLAGS_ZFS 0x4
-#define PATH_CONFIG "/boot.config"
+#define PATH_DOTCONFIG "/boot.config"
+#define PATH_CONFIG "/boot/config"
#define PATH_BOOT3 "/boot/zfsloader"
#define PATH_KERNEL "/boot/kernel/kernel"
@@ -533,7 +534,8 @@ main(void)
zfs_mount_pool(spa);
- if (zfs_lookup(spa, PATH_CONFIG, &dn) == 0) {
+ if (zfs_lookup(spa, PATH_CONFIG, &dn) == 0 ||
+ zfs_lookup(spa, PATH_DOTCONFIG, &dn) == 0) {
off = 0;
zfs_read(spa, &dn, &off, cmd, sizeof(cmd));
}
Modified: head/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- head/sys/boot/pc98/boot2/boot2.c Tue Oct 18 09:39:41 2011
(r226505)
+++ head/sys/boot/pc98/boot2/boot2.c Tue Oct 18 09:46:52 2011
(r226506)
@@ -77,7 +77,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"
@@ -379,7 +380,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) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
