summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-10-22 07:17:21 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-10-22 07:17:21 +0000
commit41d914d0081999518dfa488bc8e21787044c7e7e (patch)
treef4f80c395555ada62c6168b30c32988f19d64005
parent72d3412c4de4e7dd211c355a71be8f06c922d78f (diff)
kernel name is /bsd
-rw-r--r--sys/arch/i386/boot/boot.c6
-rw-r--r--sys/arch/i386/netboot/main.c6
-rw-r--r--sys/arch/i386/stand/boot.c3
3 files changed, 6 insertions, 9 deletions
diff --git a/sys/arch/i386/boot/boot.c b/sys/arch/i386/boot/boot.c
index 43b471620f4..a3350b21001 100644
--- a/sys/arch/i386/boot/boot.c
+++ b/sys/arch/i386/boot/boot.c
@@ -63,7 +63,7 @@ int cflag;
#endif
char *name;
char *names[] = {
- "/netbsd", "/onetbsd", "/netbsd.old",
+ "/bsd", "/obsd", "/bsd.old",
};
#define NUMNAMES (sizeof(names)/sizeof(char *))
@@ -77,8 +77,8 @@ int drive;
char *t;
printf("\n"
- ">> NetBSD BOOT: %d/%d k [%s]\n"
- "use hd(1,a)/netbsd to boot sd0 when wd0 is also installed\n",
+ ">> OpenBSD BOOT: %d/%d k [%s]\n"
+ "use hd(1,a)/bsd to boot sd0 when wd0 is also installed\n",
argv[7] = memsize(0),
argv[8] = memsize(1),
version);
diff --git a/sys/arch/i386/netboot/main.c b/sys/arch/i386/netboot/main.c
index c62ca8a9516..715db4836c9 100644
--- a/sys/arch/i386/netboot/main.c
+++ b/sys/arch/i386/netboot/main.c
@@ -307,10 +307,8 @@ static char name_set[][9] = {
};
static char *ext_set[] = {
- ".netbsd",
- ".netbsd.old",
- ".386bsd",
- ".386bsd.old",
+ ".bsd",
+ ".bsd.old",
".vmunix",
".vmunix.old",
};
diff --git a/sys/arch/i386/stand/boot.c b/sys/arch/i386/stand/boot.c
index de8f5528096..a9aad02da0c 100644
--- a/sys/arch/i386/stand/boot.c
+++ b/sys/arch/i386/stand/boot.c
@@ -63,8 +63,7 @@ static char rcsid[] = "$NetBSD: boot.c,v 1.6 1994/10/27 04:21:49 cgd Exp $";
* or if an error is encounter, try alternate files.
*/
-char *files[] = { "netbsd", "onetbsd", "netbsd.old",
- "386bsd", "o386bsd", "386bsd.old",
+char *files[] = { "bsd", "obsd", "bsd.old",
"vmunix", "ovmunix", "vmunix.old",
"boot", 0};
int retry = 0;