remove support for many alternative kernel choices -- only try /bsd and

not the other stupid names.  that feature was retarded.  tested on a few
architectures by a few people

13 files changed, 33 insertions, 313 deletions

diff --git a/sys/arch/amd64/stand/boot/boot.8 b/sys/arch/amd64/stand/boot/boot.8
index 384b918944f..ddccc8a3330 100644
--- a/sys/arch/amd64/stand/boot/boot.8
+++ b/sys/arch/amd64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.8 2007/04/28 19:23:10 deraadt Exp $
+.\"	$OpenBSD: boot.8,v 1.9 2007/05/29 00:03:08 deraadt Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -135,13 +135,8 @@ By default,
 .Nm
 attempts to load the kernel executable
 .Pa /bsd .
-If that fails, it will attempt to load
-.Pa /obsd
-and then
-.Pa /bsd.old .
-If it fails to find any of these files,
-and no alternative kernel image has been specified,
-the system will be unable to boot.
+If it fails to find the kernel and no alternative kernel image has
+been specified, the system will be unable to boot.
 .Sh COMMANDS
 The following commands are accepted at the
 .Nm
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index 205ed7c50e7..b1af77ccfe3 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2007/05/27 18:38:33 tom Exp $
+#	$OpenBSD: Makefile,v 1.8 2007/05/29 00:03:08 deraadt Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -67,4 +67,5 @@ 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}\"
+CFLAGS+=-DKERNEL=\"/${OSREV}/${MACHINE}/bsd.rd\"
 AFLAGS+=-m32
diff --git a/sys/arch/amd64/stand/cdboot/cdboot.c b/sys/arch/amd64/stand/cdboot/cdboot.c
deleted file mode 100644
index 0f129b1b410..00000000000
--- a/sys/arch/amd64/stand/cdboot/cdboot.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$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
diff --git a/sys/arch/hp300/stand/cdboot/cdboot.c b/sys/arch/hp300/stand/cdboot/cdboot.c
index 1f4ac02d3a5..928e81758ae 100644
--- a/sys/arch/hp300/stand/cdboot/cdboot.c
+++ b/sys/arch/hp300/stand/cdboot/cdboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cdboot.c,v 1.6 2005/04/22 00:42:14 miod Exp $	*/
+/*	$OpenBSD: cdboot.c,v 1.7 2007/05/29 00:03:09 deraadt Exp $	*/
 /*	$NetBSD: uboot.c,v 1.3 1997/04/27 21:17:13 thorpej Exp $	*/
 
 /*-
@@ -63,7 +63,7 @@ char *names[] = {
 #ifdef OSREV
 	OSREV "/hp300/bsd.rd",
 #endif
-	"bsd.rd", "bsd", "obsd", "bsd.old"
+	"bsd.rd", "bsd",
 };
 #define NUMNAMES	(sizeof(names) / sizeof(char *))
 
diff --git a/sys/arch/hp300/stand/uboot/uboot.c b/sys/arch/hp300/stand/uboot/uboot.c
index 59cc5570800..6ec4ee78759 100644
--- a/sys/arch/hp300/stand/uboot/uboot.c
+++ b/sys/arch/hp300/stand/uboot/uboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uboot.c,v 1.4 2005/04/22 00:42:16 miod Exp $	*/
+/*	$OpenBSD: uboot.c,v 1.5 2007/05/29 00:03:09 deraadt Exp $	*/
 /*	$NetBSD: uboot.c,v 1.3 1997/04/27 21:17:13 thorpej Exp $	*/
 
 /*-
@@ -60,7 +60,7 @@ extern	const char version[];
  */
 char *name;
 char *names[] = {
-	"bsd", "bsd.gz", "obsd", "obsd.gz", "bsd.old", "bsd.old.gz"
+	"bsd"
 };
 #define NUMNAMES	(sizeof(names) / sizeof(char *))
 
diff --git a/sys/arch/hppa/stand/boot/boot.8 b/sys/arch/hppa/stand/boot/boot.8
index 4608b009b5e..fc6c63dfd76 100644
--- a/sys/arch/hppa/stand/boot/boot.8
+++ b/sys/arch/hppa/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.15 2007/02/06 20:07:15 jmc Exp $
+.\"	$OpenBSD: boot.8,v 1.16 2007/05/29 00:03:09 deraadt Exp $
 .\"
 .\" Copyright (c) 2002 Miodrag Vallat
 .\" Copyright (c) 1997-2002 Michael Shalayeff
@@ -103,13 +103,8 @@ By default,
 .Nm
 attempts to load the kernel executable
 .Pa /bsd .
-If that fails, it will attempt to load
-.Pa /obsd
-and then
-.Pa /bsd.old .
-If it fails to find any of these files,
-and no alternative kernel image has been specified,
-the system will be unable to boot.
+If it fails to find the kernel and no alternative kernel image has
+been specified, the system will be unable to boot.
 .Sh COMMANDS
 The following commands are accepted at the
 .Nm
diff --git a/sys/arch/hppa64/stand/boot/boot.8 b/sys/arch/hppa64/stand/boot/boot.8
index 8fb2261cef7..580ca869bb3 100644
--- a/sys/arch/hppa64/stand/boot/boot.8
+++ b/sys/arch/hppa64/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.4 2007/02/06 20:07:15 jmc Exp $
+.\"	$OpenBSD: boot.8,v 1.5 2007/05/29 00:03:09 deraadt Exp $
 .\"
 .\" Copyright (c) 2002 Miodrag Vallat
 .\" Copyright (c) 1997-2005 Michael Shalayeff
@@ -103,13 +103,8 @@ By default,
 .Nm
 attempts to load the kernel executable
 .Pa /bsd .
-If that fails, it will attempt to load
-.Pa /obsd
-and then
-.Pa /bsd.old .
-If it fails to find any of these files,
-and no alternative kernel image has been specified,
-the system will be unable to boot.
+If it fails to find the kernel and no alternative kernel image has
+been specified, the system will be unable to boot.
 .Sh COMMANDS
 The following commands are accepted at the
 .Nm
diff --git a/sys/arch/i386/stand/boot/boot.8 b/sys/arch/i386/stand/boot/boot.8
index fccd421c520..f4880c457ee 100644
--- a/sys/arch/i386/stand/boot/boot.8
+++ b/sys/arch/i386/stand/boot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.45 2007/04/27 10:08:34 tom Exp $
+.\"	$OpenBSD: boot.8,v 1.46 2007/05/29 00:03:10 deraadt Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -135,13 +135,8 @@ By default,
 .Nm
 attempts to load the kernel executable
 .Pa /bsd .
-If that fails, it will attempt to load
-.Pa /obsd
-and then
-.Pa /bsd.old .
-If it fails to find any of these files,
-and no alternative kernel image has been specified,
-the system will be unable to boot.
+If it fails to find the kernel and no alternative kernel image has
+been specified, the system will be unable to boot.
 .Sh COMMANDS
 The following commands are accepted at the
 .Nm
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile
index 108f6dcf13c..5e2e9b82ac0 100644
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2005/07/30 14:32:46 millert Exp $
+#	$OpenBSD: Makefile,v 1.5 2007/05/29 00:03:10 deraadt Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -15,7 +15,7 @@ LDFLAGS+=-Ttext $(LINKADDR) -N -x -noinhibit-exec
 CLEANFILES+=	crt0.o
 SRCS=	srt0.S
 
-SRCS+=	cdboot.c cmd.c vars.c bootarg.c conf.c
+SRCS+=	boot.c cmd.c vars.c bootarg.c conf.c
 S	=${.CURDIR}/../../../..
 SADIR=	${.CURDIR}/..
 
@@ -43,5 +43,6 @@ CPPFLAGS+=-DBOOTMAGIC=$(BOOTMAGIC) ${DEBUGFLAGS}
 CPPFLAGS+=-DLINKADDR=${LINKADDR}
 CFLAGS+=${SACFLAGS} -D__INTERNAL_LIBSA_CREAD
 CFLAGS+=-DOSREV=\"${OSREV}\" -DMACHINE=\"${MACHINE}\"
+CFLAGS+=-DKERNEL=\"/${OSREV}/${MACHINE}/bsd.rd\"
 #AFLAGS+=-Wa,-R
 # AFLAGS+=-Wa,-a
diff --git a/sys/arch/i386/stand/cdboot/cdboot.c b/sys/arch/i386/stand/cdboot/cdboot.c
deleted file mode 100644
index 8b1f2e91f4f..00000000000
--- a/sys/arch/i386/stand/cdboot/cdboot.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	$OpenBSD: cdboot.c,v 1.1 2004/08/24 15:28:41 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
diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c
index 936c376cd24..7a4a61dea66 100644
--- a/sys/arch/sparc64/stand/ofwboot/boot.c
+++ b/sys/arch/sparc64/stand/ofwboot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.13 2007/05/03 18:38:11 deraadt Exp $	*/
+/*	$OpenBSD: boot.c,v 1.14 2007/05/29 00:03:13 deraadt Exp $	*/
 /*	$NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $	*/
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -67,7 +67,6 @@
  */
 char *kernels[] = {
 	"bsd",
-	"obsd",
 	NULL
 };
 
diff --git a/sys/arch/zaurus/stand/zboot/boot.8 b/sys/arch/zaurus/stand/zboot/boot.8
index f5ecf985780..5642db2d957 100644
--- a/sys/arch/zaurus/stand/zboot/boot.8
+++ b/sys/arch/zaurus/stand/zboot/boot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: boot.8,v 1.6 2005/12/16 16:49:46 jmc Exp $
+.\"	$OpenBSD: boot.8,v 1.7 2007/05/29 00:03:13 deraadt Exp $
 .\"
 .\" Copyright (c) 1997-2001 Michael Shalayeff
 .\" All rights reserved.
@@ -127,13 +127,8 @@ By default,
 .Nm
 attempts to load the kernel executable
 .Pa /bsd .
-If that fails, it will attempt to load
-.Pa /obsd
-and then
-.Pa /bsd.old .
-If it fails to find any of these files,
-and no alternative kernel image has been specified,
-the system will be unable to boot.
+If it fails to find the kernel and no alternative kernel image has
+been specified, the system will be unable to boot.
 .Sh COMMANDS
 The following commands are accepted at the
 .Nm
diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c
index cd1930afae3..402537771de 100644
--- a/sys/stand/boot/boot.c
+++ b/sys/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.32 2004/06/24 22:32:26 tom Exp $	*/
+/*	$OpenBSD: boot.c,v 1.33 2007/05/29 00:03:13 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2003 Dale Rahn
@@ -37,12 +37,9 @@
 
 #include "cmd.h"
 
-static const char *const kernels[] = {
-	"/bsd",
-	"/obsd",
-	"/bsd.old",
-	NULL
-};
+#ifndef KERNEL
+#define KERNEL "/bsd"
+#endif
 
 char prog_ident[40];
 char *progname = "BOOT";
@@ -56,8 +53,8 @@ int bootprompt = 1;
 void
 boot(dev_t bootdev)
 {
-	const char *bootfile = kernels[0];
-	int i = 0, try = 0, st;
+	const char *bootfile = KERNEL;
+	int try = 0, st;
 	u_long marks[MARK_MAX];
 
 	machdep();
@@ -92,11 +89,8 @@ boot(dev_t bootdev)
 		if (loadfile(cmd.path, marks, LOAD_ALL) >= 0)
 			break;
 
-		if (kernels[++i] == NULL) {
-			try += 1;
-			bootfile = kernels[i=0];
-		} else
-			bootfile = kernels[i];
+		bootfile = KERNEL;
+		try++;
 		strlcpy(cmd.image, bootfile, sizeof(cmd.image));
 		printf(" failed(%d). will try %s\n", errno, bootfile);