summaryrefslogtreecommitdiff
path: root/usr.sbin/installboot/installboot.c
diff options
context:
space:
mode:
authordrochner <drochner@NetBSD.org>2010-01-14 17:49:31 +0000
committerdrochner <drochner@NetBSD.org>2010-01-14 17:49:31 +0000
commit79f027bbd6493b7fb048ae236987e2bcbc118f10 (patch)
treeaea1a582506e1b5db318bcfc3405e9d2b42e2b14 /usr.sbin/installboot/installboot.c
parentaa0d6833111230f3d5d93b26a96751f03c1f70b7 (diff)
On i386/amd64, define two flag bits in the boot parameters which control
whether modules are loaded and whether boot.cfg is evaluated, and set both to "off" per default in the PXE bootloader. Extend "installboot" to toggle the bits. This way, pxeboot works with existing dhcp server setups (and as described in the manpage) out of the box. Also, boot.cfg reading involves a stat() call which is horribly inefficient with the TFTP pseudo file system.
Diffstat (limited to 'usr.sbin/installboot/installboot.c')
-rw-r--r--usr.sbin/installboot/installboot.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/installboot/installboot.c b/usr.sbin/installboot/installboot.c
index 3b212a33560..7573a9fe91b 100644
--- a/usr.sbin/installboot/installboot.c
+++ b/usr.sbin/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.33 2010/01/14 16:27:49 tsutsui Exp $ */
+/* $NetBSD: installboot.c,v 1.34 2010/01/14 17:49:32 drochner Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if !defined(__lint)
-__RCSID("$NetBSD: installboot.c,v 1.33 2010/01/14 16:27:49 tsutsui Exp $");
+__RCSID("$NetBSD: installboot.c,v 1.34 2010/01/14 17:49:32 drochner Exp $");
#endif /* !__lint */
#include <sys/ioctl.h>
@@ -87,6 +87,8 @@ const struct option {
{ "speed", IB_CONSPEED, OPT_INT, OFFSET(conspeed) },
{ "sunsum", IB_SUNSUM, OPT_BOOL, 0 },
{ "timeout", IB_TIMEOUT, OPT_INT, OFFSET(timeout) },
+ { "modules", IB_MODULES, OPT_BOOL, 0 },
+ { "bootconf", IB_BOOTCONF, OPT_BOOL, 0 },
{ .name = NULL },
};
#undef OFFSET