summaryrefslogtreecommitdiff
path: root/sys/pc98/i386/autoconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/pc98/i386/autoconf.c')
-rw-r--r--sys/pc98/i386/autoconf.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/pc98/i386/autoconf.c b/sys/pc98/i386/autoconf.c
index d5f5d0e5ac1f..64746500413a 100644
--- a/sys/pc98/i386/autoconf.c
+++ b/sys/pc98/i386/autoconf.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $Id: autoconf.c,v 1.55 1996/06/08 09:37:35 bde Exp $
+ * $Id: autoconf.c,v 1.1.1.1 1996/06/14 10:04:40 asami Exp $
*/
/*
@@ -210,6 +210,9 @@ configure(dummy)
#endif
#endif /* !PC98 */
+ if (setdumpdev(dumpdev) != 0)
+ dumpdev = NODEV;
+
configure_finish();
cninit_finish();
@@ -287,15 +290,11 @@ configure(dummy)
setroot();
}
#endif
+
if (!mountroot) {
panic("Nobody wants to mount my root for me");
}
- /*
- * Configure swap area and related system
- * parameter based on device(s) used.
- */
- if (bootverbose)
- printf("Configuring root and swap devs.\n");
+
setconf();
cold = 0;
if (bootverbose)
@@ -311,7 +310,6 @@ setdumpdev(dev)
if (dev == NODEV) {
dumpdev = dev;
- dumplo = 0;
return (0);
}
maj = major(dev);
@@ -398,9 +396,8 @@ sysctl_kern_dumpdev SYSCTL_HANDLER_ARGS
ndumpdev = dumpdev;
error = sysctl_handle_opaque(oidp, &ndumpdev, sizeof ndumpdev, req);
- if (!error && ndumpdev != dumpdev) {
+ if (error == 0 && req->newptr != NULL)
error = setdumpdev(ndumpdev);
- }
return (error);
}