diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-05-30 01:44:18 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1998-05-30 01:44:18 +0000 |
| commit | a9db6f073d3c1df3d50ea950c30128dca0c7eacf (patch) | |
| tree | 5ff6911bca51ade13e292951089bf0731acd3c86 /sys/stand | |
| parent | 9db739a8d1f1a70481e623e24283a35643a7031b (diff) | |
add bsd.old, bsd.old.gz kernels.
print boot label earlier.
Diffstat (limited to 'sys/stand')
| -rw-r--r-- | sys/stand/boot/boot.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c index 48b63e774c5..1337689c6c3 100644 --- a/sys/stand/boot/boot.c +++ b/sys/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.19 1998/05/25 19:17:36 mickey Exp $ */ +/* $OpenBSD: boot.c,v 1.20 1998/05/30 01:44:17 mickey Exp $ */ /* * Copyright (c) 1997,1998 Michael Shalayeff @@ -38,9 +38,10 @@ #include <libsa.h> #include "cmd.h" -const char *const kernels[] = { +static const char *const kernels[] = { "/bsd", "/bsd.gz", "/obsd", "/obsd.gz", + "/bsd.old", "/bsd.old.gz", NULL }; @@ -56,6 +57,8 @@ boot(bootdev) machdep(); + printf(">> OpenBSD/" MACHINE_ARCH " BOOT %s\n", version); + devboot(bootdev, cmd.bootdev); strncpy(cmd.image, bootfile, sizeof(cmd.image)); cmd.boothowto = 0; @@ -65,8 +68,6 @@ boot(bootdev) st = read_conf(); - printf(">> OpenBSD/" MACHINE_ARCH " BOOT %s\n", version); - while (1) { if (st <= 0) /* no boot.conf, or no boot cmd in there */ do { |