diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/aoeboot.c | 2 | ||||
| -rw-r--r-- | src/usr/autoboot.c | 4 | ||||
| -rw-r--r-- | src/usr/iscsiboot.c | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/usr/aoeboot.c b/src/usr/aoeboot.c index 6bf56a87..f0e481bd 100644 --- a/src/usr/aoeboot.c +++ b/src/usr/aoeboot.c @@ -5,7 +5,6 @@ #include <gpxe/aoe.h> #include <gpxe/ata.h> #include <gpxe/netdevice.h> -#include <gpxe/dhcp.h> #include <gpxe/settings.h> #include <gpxe/abft.h> #include <int13.h> @@ -56,7 +55,6 @@ int aoeboot ( const char *root_path ) { container_of ( ata.backend, struct aoe_session, refcnt ); abft_fill_data ( aoe ); - drive.drive = fetch_uintz_setting ( NULL, DHCP_EB_BIOS_DRIVE ); drive.blockdev = &ata.blockdev; register_int13_drive ( &drive ); diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c index bc86d05e..c1a61ec0 100644 --- a/src/usr/autoboot.c +++ b/src/usr/autoboot.c @@ -147,14 +147,14 @@ static int netboot ( struct net_device *netdev ) { return rc; /* Try to download and boot whatever we are given as a filename */ - fetch_string_setting ( NULL, DHCP_BOOTFILE_NAME, buf, sizeof ( buf ) ); + fetch_string_setting ( NULL, &filename_setting, buf, sizeof ( buf ) ); if ( buf[0] ) { printf ( "Booting from filename \"%s\"\n", buf ); return boot_filename ( buf ); } /* No filename; try the root path */ - fetch_string_setting ( NULL, DHCP_ROOT_PATH, buf, sizeof ( buf ) ); + fetch_string_setting ( NULL, &root_path_setting, buf, sizeof ( buf ) ); if ( buf[0] ) { printf ( "Booting from root path \"%s\"\n", buf ); return boot_root_path ( buf ); diff --git a/src/usr/iscsiboot.c b/src/usr/iscsiboot.c index c3a477c4..99edc879 100644 --- a/src/usr/iscsiboot.c +++ b/src/usr/iscsiboot.c @@ -2,7 +2,6 @@ #include <string.h> #include <stdio.h> #include <gpxe/iscsi.h> -#include <gpxe/dhcp.h> #include <gpxe/settings.h> #include <gpxe/netdevice.h> #include <gpxe/ibft.h> @@ -46,7 +45,6 @@ int iscsiboot ( const char *root_path ) { goto error_init; } - drive.drive = fetch_uintz_setting ( NULL, DHCP_EB_BIOS_DRIVE ); drive.blockdev = &scsi.blockdev; /* FIXME: ugly, ugly hack */ |