From 92d15eff30410dcb0ec406e06b131fb7d9179ffd Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Tue, 25 Mar 2008 20:46:16 +0000 Subject: [Settings] Remove assumption that all settings have DHCP tag values Allow for settings to be described by something other than a DHCP option tag if desirable. Currently used only for the MAC address setting. Separate out fake DHCP packet creation code from dhcp.c to fakedhcp.c. Remove notion of settings from dhcppkt.c. Rationalise dhcp.c to use settings API only for final registration of the DHCP options, rather than using {store,fetch}_setting throughout. --- src/arch/i386/image/nbi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/arch') diff --git a/src/arch/i386/image/nbi.c b/src/arch/i386/image/nbi.c index 79dc8d1a1..73791be90 100644 --- a/src/arch/i386/image/nbi.c +++ b/src/arch/i386/image/nbi.c @@ -8,8 +8,7 @@ #include #include #include -#include -#include +#include #include #include @@ -400,8 +399,8 @@ static int nbi_prepare_dhcp ( struct image *image ) { return -ENODEV; } - if ( ( rc = create_dhcpack ( boot_netdev, basemem_packet, - sizeof ( basemem_packet ) ) ) != 0 ) { + if ( ( rc = create_fakedhcpack ( boot_netdev, basemem_packet, + sizeof ( basemem_packet ) ) ) != 0 ) { DBGC ( image, "NBI %p failed to build DHCP packet\n", image ); return rc; } -- cgit v1.2.3-55-g7522