diff options
| author | oster <oster@NetBSD.org> | 2006-11-30 15:12:17 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2006-11-30 15:12:17 +0000 |
| commit | 212a5b65f4aeb2f805650867965dcf95a187303e (patch) | |
| tree | 499caafdf8c82bd23f849ada5f85effad77f6a53 /sys/dev/raidframe | |
| parent | 3cd8d2740358d06f62004f3fb96942236ab4c738 (diff) | |
If the user has specified 'root on foo', then skip changing the booted_device
even if we've detected a 'root on raid' autoconfigure. This change is really
only cosmetic, since setroot() will still do the right thing and honor
the 'root on foo' setting.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_netbsdkintf.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index e321604d05d..600d0360a66 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.222 2006/11/16 01:33:23 christos Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.223 2006/11/30 15:12:17 oster Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -146,7 +146,7 @@ ***********************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.222 2006/11/16 01:33:23 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.223 2006/11/30 15:12:17 oster Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -489,6 +489,12 @@ rf_buildroothack(RF_ConfigSet_t *config_sets) cset = next_cset; } + /* if the user has specified what the root device should be + then we don't touch booted_device or boothowto... */ + + if (rootspec != NULL) + return; + /* we found something bootable... */ if (num_root == 1) { |
