details: https://anonhg.NetBSD.org/src/rev/5229c7820002
branches: trunk
changeset: 500107:5229c7820002
user: drochner <drochner%NetBSD.org@localhost>
date: Tue Dec 05 17:59:43 2000 +0000
description:
add a kernel configuration option to set the string passed in bp_file
in diskless BOOTP/DHCP configuration - good for booting different
userland versions depending on the kernel version
diffstat:
sys/conf/files | 3 ++-
sys/nfs/nfs_bootdhcp.c | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diffs (36 lines):
diff -r ee93eddcf6e4 -r 5229c7820002 sys/conf/files
--- a/sys/conf/files Tue Dec 05 17:53:46 2000 +0000
+++ b/sys/conf/files Tue Dec 05 17:59:43 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.407 2000/12/02 20:43:08 scw Exp $
+# $NetBSD: files,v 1.408 2000/12/05 17:59:43 drochner Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -20,6 +20,7 @@
defopt opt_ntp.h PPS_SYNC NTP
defopt opt_nfs_boot.h NFS_BOOT_BOOTP NFS_BOOT_BOOTPARAM NFS_BOOT_DHCP
+ NFS_BOOT_BOOTP_REQFILE
NFS_BOOT_GATEWAY
NFS_BOOT_TCP NFS_BOOT_OPTIONS NFS_BOOT_RWSIZE
defopt opt_nfs.h NFS_V2_ONLY
diff -r ee93eddcf6e4 -r 5229c7820002 sys/nfs/nfs_bootdhcp.c
--- a/sys/nfs/nfs_bootdhcp.c Tue Dec 05 17:53:46 2000 +0000
+++ b/sys/nfs/nfs_bootdhcp.c Tue Dec 05 17:59:43 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bootdhcp.c,v 1.15 2000/05/28 07:01:09 gmcgarry Exp $ */
+/* $NetBSD: nfs_bootdhcp.c,v 1.16 2000/12/05 17:59:43 drochner Exp $ */
/*-
* Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -547,6 +547,9 @@
bootp->bp_hlen = halen; /* Hardware address length */
bootp->bp_xid = ++xid;
memcpy(bootp->bp_chaddr, haddr, halen);
+#ifdef NFS_BOOT_BOOTP_REQFILE
+ strncpy(bootp->bp_file, NFS_BOOT_BOOTP_REQFILE, sizeof(bootp->bp_file));
+#endif
/* Fill-in the vendor data. */
memcpy(bootp->bp_vend, vm_rfc1048, 4);
#ifdef NFS_BOOT_DHCP