svn commit: r231287 - in stable/9/sys/boot: arm/at91/boot2 arm/ixp425/boot2 i386/boot2 i386/gptboot i386/zfsboot pc98/boot2

[Baptiste Daroussin]

Author: bapt
Date: Thu Feb  9 16:53:51 2012
New Revision: 231287
URL: http://svn.freebsd.org/changeset/base/231287

Log:
  MFH r226506: Look for /boot/config in addition to /boot.config
  
  Approved by:	des (mentor)

Modified:
  stable/9/sys/boot/arm/at91/boot2/boot2.c
  stable/9/sys/boot/arm/ixp425/boot2/boot2.c
  stable/9/sys/boot/i386/boot2/boot2.c
  stable/9/sys/boot/i386/gptboot/gptboot.c
  stable/9/sys/boot/i386/zfsboot/zfsboot.c
  stable/9/sys/boot/pc98/boot2/boot2.c
Directory Properties:
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/arm/at91/boot2/boot2.c
==============================================================================
--- stable/9/sys/boot/arm/at91/boot2/boot2.c	Thu Feb  9 16:12:25 2012	(r231286)
+++ stable/9/sys/boot/arm/at91/boot2/boot2.c	Thu Feb  9 16:53:51 2012	(r231287)
@@ -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: stable/9/sys/boot/arm/ixp425/boot2/boot2.c
==============================================================================
--- stable/9/sys/boot/arm/ixp425/boot2/boot2.c	Thu Feb  9 16:12:25 2012	(r231286)
+++ stable/9/sys/boot/arm/ixp425/boot2/boot2.c	Thu Feb  9 16:53:51 2012	(r231287)
@@ -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: stable/9/sys/boot/i386/boot2/boot2.c
==============================================================================
--- stable/9/sys/boot/i386/boot2/boot2.c	Thu Feb  9 16:12:25 2012	(r231286)
+++ stable/9/sys/boot/i386/boot2/boot2.c	Thu Feb  9 16:53:51 2012	(r231287)
@@ -74,7 +74,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"
 
@@ -238,7 +239,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: stable/9/sys/boot/i386/gptboot/gptboot.c
==============================================================================
--- stable/9/sys/boot/i386/gptboot/gptboot.c	Thu Feb  9 16:12:25 2012	(r231286)
+++ stable/9/sys/boot/i386/gptboot/gptboot.c	Thu Feb  9 16:53:51 2012	(r231287)
@@ -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: stable/9/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- stable/9/sys/boot/i386/zfsboot/zfsboot.c	Thu Feb  9 16:12:25 2012	(r231286)
+++ stable/9/sys/boot/i386/zfsboot/zfsboot.c	Thu Feb  9 16:53:51 2012	(r231287)
@@ -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: stable/9/sys/boot/pc98/boot2/boot2.c
==============================================================================
--- stable/9/sys/boot/pc98/boot2/boot2.c	Thu Feb  9 16:12:25 2012	(r231286)
+++ stable/9/sys/boot/pc98/boot2/boot2.c	Thu Feb  9 16:53:51 2012	(r231287)
@@ -76,7 +76,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"
 
@@ -376,7 +377,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) {