diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-31 23:56:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-03-31 23:56:30 +0000 |
| commit | ad545ce20ca354f031894f304a4e38556a2c6818 (patch) | |
| tree | bda2c59d2bffa68acf0ceb8e8facd64e5c1651da /sys | |
| parent | 3e2e04c9fe06481896d7c0a594ca0707f9e5318b (diff) | |
nope, sorry, the miod/naddy raidframe change breaks almost all ramdisks.
the basic idea is that ramdisks boot the same way as swap generic -- this
commit also improves the comment in that area. in this case the one
outlier is raidframe, and those who use it will no longer be able to
put off repairing it -- raidframe must follow the same setroot() / bootdv
API that everything else in the system uses.
debugged with krw
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/subr_disk.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index afcda8e9bef..a7647c7e2b1 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.71 2008/03/31 22:27:41 deraadt Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.72 2008/03/31 23:56:29 deraadt Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -1171,8 +1171,11 @@ gotswap: rootdv = bootdv; rootdev = dumpdev = swapdev = NODEV; #endif - } else if (mountroot == NULL && rootdev == NODEV) { - /* `swap generic': Use the device the ROM told us to use */ + } else if (mountroot == NULL) { + /* + * `swap generic' or RAMDISK_HOOKS -- use the + * device we were told to + */ rootdv = bootdv; majdev = findblkmajor(rootdv); if (majdev >= 0) { |