diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-05-26 22:49:59 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2008-05-26 22:49:59 +0000 |
| commit | d5508fe104f966fa96e8b9f517f7d026dcfabd33 (patch) | |
| tree | fb4d9bfe5e9a693aa64b51fcdba1707145ac8717 | |
| parent | 8488a10e14ad3097ed15419fa9b3ec45e810a7f5 (diff) | |
do not muck with the mountroot variable, since setroot() uses the state of
it and rootdev to determine whether it is booting 'generic', 'nfs', or from
a specified disk partition
ok krw
| -rw-r--r-- | sys/arch/amd64/amd64/autoconf.c | 3 | ||||
| -rw-r--r-- | sys/arch/i386/i386/autoconf.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c index 29c2e687b0a..eba2b24baac 100644 --- a/sys/arch/amd64/amd64/autoconf.c +++ b/sys/arch/amd64/amd64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.26 2008/05/25 03:21:24 krw Exp $ */ +/* $OpenBSD: autoconf.c,v 1.27 2008/05/26 22:49:58 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -170,7 +170,6 @@ diskconf(void) #if defined(NFSCLIENT) printf("PXE boot MAC address %s, interface %s\n", ether_sprintf(bios_bootmac->mac), ifp->if_xname); - mountroot = nfs_mountroot; /* potentially */ bootdv = parsedisk(ifp->if_xname, strlen(ifp->if_xname), 0, &tmpdev); part = 0; diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c index 81106dced22..ddac2feadde 100644 --- a/sys/arch/i386/i386/autoconf.c +++ b/sys/arch/i386/i386/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.79 2008/03/19 05:47:44 deraadt Exp $ */ +/* $OpenBSD: autoconf.c,v 1.80 2008/05/26 22:49:57 deraadt Exp $ */ /* $NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $ */ /*- @@ -207,7 +207,6 @@ diskconf(void) #if defined(NFSCLIENT) printf("PXE boot MAC address %s, interface %s\n", ether_sprintf(bios_bootmac->mac), ifp->if_xname); - mountroot = nfs_mountroot; /* potentially */ bootdv = parsedisk(ifp->if_xname, strlen(ifp->if_xname), 0, &tmpdev); part = 0; |