diff options
| author |   niklas <niklas@openbsd.org> | 1997-10-28 10:52:17 +0000 |
|---|---|---|
| committer | niklas <niklas@openbsd.org> | 1997-10-28 10:52:17 +0000 |
| commit | 5879319afbbff28f14cf99e8a449ee2d62b603df (patch) | |
| tree | 11f899158c621b0c28bea948771f8197aed19ff8 | |
| parent | stand missing (diff) | |
| download | wireguard-openbsd-5879319afbbff28f14cf99e8a449ee2d62b603df.tar.xz wireguard-openbsd-5879319afbbff28f14cf99e8a449ee2d62b603df.zip | |
dkcsum is *really* mandatory. XXX will be done differently later.
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 22 | ||||
| -rw-r--r-- | sys/kern/init_main.c | 10 |
2 files changed, 10 insertions, 22 deletions
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index 3ef36b19ae2..0fea0692326 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.27 1997/10/27 15:47:48 mickey Exp $ */ +/* $OpenBSD: autoconf.c,v 1.28 1997/10/28 10:52:18 niklas Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -62,12 +62,6 @@ #include <dev/cons.h> -#include "bios.h" -#if NBIOS > 0 -extern void dkcsumattach __P((void)); /* XXX should be elsewhere */ -int i386_mountroot __P((void)); -#endif - void swapconf __P((void)); void setroot __P((void)); void setconf __P((void)); @@ -369,11 +363,7 @@ noask: } doswap: -#if NBIOS > 0 - mountroot = i386_mountroot; -#else mountroot = dk_mountroot; -#endif swdevt[0].sw_dev = argdev = dumpdev = makedev(major(rootdev), minor(rootdev) + 1); /* swap size and dumplo set during autoconfigure */ @@ -382,13 +372,3 @@ doswap: rootdev = dumpdev; #endif } - -#if NBIOS > 0 -int -i386_mountroot() -{ - /* Establish BIOS to BSD disk mappings. */ - dkcsumattach(); - return (dk_mountroot()); -} -#endif diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 5753d2fb76a..02049b7dc4c 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_main.c,v 1.26 1997/10/06 20:19:49 deraadt Exp $ */ +/* $OpenBSD: init_main.c,v 1.27 1997/10/28 10:52:17 niklas Exp $ */ /* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */ /* @@ -334,6 +334,14 @@ main(framep) roundrobin(NULL); schedcpu(NULL); +#ifdef i386 + /* XXX This is only a transient solution */ + { + extern dkcsumattach __P((void)); + dkcsumattach(); + } +#endif + /* Mount the root file system. */ if ((*mountroot)()) panic("cannot mount root"); |