Have cdboot look for /3.6/amd64/bsd.rd first.

"go for it" deraadt@

2 files changed, 128 insertions, 2 deletions

diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index ec48e91e56f..7a28a272f1f 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2004/08/21 18:53:38 tom Exp $
+#	$OpenBSD: Makefile,v 1.2 2004/08/24 15:34:59 tom Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -9,7 +9,7 @@ S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
 PROG=	cdboot
-SRCS=	srt0.S conf.c
+SRCS=	srt0.S cdboot.c conf.c
 LD?=	ld
 SIZE?=	size
 LDFLAGS+=-melf_i386 -nostdlib -Bstatic -Ttext $(LINKADDR) -N -x -noinhibit-exec
@@ -63,4 +63,5 @@ CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS}
 CPPFLAGS+=-DSLOW -DSMALL -DNOBYFOUR -DNO_GZIP -DDYNAMIC_CRC_TABLE
 CPPFLAGS+=-DLINKADDR=${LINKADDR} -I${S}/stand/boot
 CFLAGS+=-m32 ${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
+CFLAGS+=-DOSREV=\"${OSREV}\" -DMACHINE=\"${MACHINE}\"
 AFLAGS+=-m32
diff --git a/sys/arch/amd64/stand/cdboot/cdboot.c b/sys/arch/amd64/stand/cdboot/cdboot.c
new file mode 100644
index 00000000000..0f129b1b410
--- /dev/null
+++ b/sys/arch/amd64/stand/cdboot/cdboot.c
@@ -0,0 +1,125 @@
+/*	$OpenBSD: cdboot.c,v 1.1 2004/08/24 15:34:59 tom Exp $	*/
+
+/*
+ * Copyright (c) 2003 Dale Rahn
+ * Copyright (c) 1997,1998 Michael Shalayeff
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <sys/param.h>
+#include <sys/reboot.h>
+#include <sys/stat.h>
+#include <libsa.h>
+#include <lib/libsa/loadfile.h>
+#include <lib/libkern/funcs.h>
+
+#include "../../../../stand/boot/cmd.h"
+
+static const char *const kernels[] = {
+	"/" OSREV "/" MACHINE "/bsd.rd",
+	"/bsd",
+	"/obsd",
+	"/bsd.old",
+	NULL
+};
+
+char prog_ident[40];
+char *progname = "BOOT";
+
+extern	const char version[];
+struct cmd_state cmd;
+
+/* bootprompt can be set by MD code to avoid prompt first time round */
+int bootprompt = 1;
+
+void
+boot(dev_t bootdev)
+{
+	const char *bootfile = kernels[0];
+	int i = 0, try = 0, st;
+	u_long marks[MARK_MAX];
+
+	machdep();
+
+	snprintf(prog_ident, sizeof(prog_ident),
+	    ">> OpenBSD/" MACHINE " %s %s", progname, version);
+	printf("%s\n", prog_ident);
+
+	devboot(bootdev, cmd.bootdev);
+	strlcpy(cmd.image, bootfile, sizeof(cmd.image));
+	cmd.boothowto = 0;
+	cmd.conf = "/etc/boot.conf";
+	cmd.addr = (void *)DEFAULT_KERNEL_ADDRESS;
+	cmd.timeout = 5;
+
+	st = read_conf();
+	if (!bootprompt)
+		snprintf(cmd.path, sizeof cmd.path, "%s:%s",
+		    cmd.bootdev, cmd.image);
+
+	while (1) {
+		/* no boot.conf, or no boot cmd in there */
+		if (bootprompt && st <= 0)
+			do {
+				printf("boot> ");
+			} while(!getcmd());
+		st = 0;
+		bootprompt = 1;	/* allow reselect should we fail */
+
+		printf("booting %s: ", cmd.path);
+		marks[MARK_START] = (u_long)cmd.addr;
+		if (loadfile(cmd.path, marks, LOAD_ALL) >= 0)
+			break;
+
+		if (kernels[++i] == NULL) {
+			try += 1;
+			bootfile = kernels[i=0];
+		} else
+			bootfile = kernels[i];
+		strlcpy(cmd.image, bootfile, sizeof(cmd.image));
+		printf(" failed(%d). will try %s\n", errno, bootfile);
+
+		if (try < 2) {
+			if (cmd.timeout > 0)
+				cmd.timeout++;
+		} else {
+			if (cmd.timeout)
+				printf("Turning timeout off.\n");
+			cmd.timeout = 0;
+		}
+	}
+
+	/* exec */
+	run_loadfile(marks, cmd.boothowto);
+}
+
+#ifdef _TEST
+int
+main()
+{
+	boot(0);
+	return 0;
+}
+#endif