summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-05-26 22:49:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-05-26 22:49:59 +0000
commitd5508fe104f966fa96e8b9f517f7d026dcfabd33 (patch)
treefb4d9bfe5e9a693aa64b51fcdba1707145ac8717 /sys/arch/i386
parent8488a10e14ad3097ed15419fa9b3ec45e810a7f5 (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
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/i386/autoconf.c3
1 files changed, 1 insertions, 2 deletions
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;