diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-18 14:20:50 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2000-12-18 14:20:50 +0000 |
| commit | b19ef695af2cde221e301616bd41fcbb3efdac2b (patch) | |
| tree | e8bbf90db2816a1de3052ec30e2fdfffb6a4fb39 /mdk-stage1/network.c | |
| parent | ae498bffc0dd4235ed9e34c76b7239f24ec7ba85 (diff) | |
| download | drakx-backup-do-not-use-b19ef695af2cde221e301616bd41fcbb3efdac2b.tar drakx-backup-do-not-use-b19ef695af2cde221e301616bd41fcbb3efdac2b.tar.gz drakx-backup-do-not-use-b19ef695af2cde221e301616bd41fcbb3efdac2b.tar.bz2 drakx-backup-do-not-use-b19ef695af2cde221e301616bd41fcbb3efdac2b.tar.xz drakx-backup-do-not-use-b19ef695af2cde221e301616bd41fcbb3efdac2b.zip | |
polish for integration into cooker
Diffstat (limited to 'mdk-stage1/network.c')
| -rw-r--r-- | mdk-stage1/network.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index a2932863c..12df7f136 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -39,6 +39,7 @@ #include "dns.h" #include "mount.h" #include "automatic.h" +#include "dhcp.h" #include "network.h" @@ -332,9 +333,16 @@ static enum return_type setup_network_interface(struct interface_info * intf) } intf->boot_proto = BOOTPROTO_STATIC; } else { - error_message("DHCP not implemented yet"); - intf->boot_proto = BOOTPROTO_DHCP; + error_message("Currently unsupported"); return RETURN_ERROR; + + results = RETURN_ERROR; //setup_network_intf_as_dhcp(intf); + if (results == RETURN_BACK) + return setup_network_interface(intf); + if (results == RETURN_ERROR) + return results; + intf->boot_proto = BOOTPROTO_DHCP; + return RETURN_OK; } if (configure_net_device(intf)) @@ -559,14 +567,12 @@ enum return_type nfs_prepare(void) enum return_type ftp_prepare(void) { - enum return_type results = intf_select_and_up(); - - return RETURN_ERROR | results; + error_message("Currently unsupported"); + return RETURN_ERROR; } enum return_type http_prepare(void) { - enum return_type results = intf_select_and_up(); - - return RETURN_ERROR | results; + error_message("Currently unsupported"); + return RETURN_ERROR; } |