diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2001-06-20 15:31:20 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-06-20 15:31:20 +0000 |
| commit | cd417a1a507369b6df9ab23415bf6da3579c2bc5 (patch) | |
| tree | fd3ee079320c38e87e3079edd28aa3878e1cfdb7 /mdk-stage1/network.c | |
| parent | 957fd74e4e5f5b58c7ff6cc6ed64ad200db6e6bb (diff) | |
| download | drakx-backup-do-not-use-cd417a1a507369b6df9ab23415bf6da3579c2bc5.tar drakx-backup-do-not-use-cd417a1a507369b6df9ab23415bf6da3579c2bc5.tar.gz drakx-backup-do-not-use-cd417a1a507369b6df9ab23415bf6da3579c2bc5.tar.bz2 drakx-backup-do-not-use-cd417a1a507369b6df9ab23415bf6da3579c2bc5.tar.xz drakx-backup-do-not-use-cd417a1a507369b6df9ab23415bf6da3579c2bc5.zip | |
save adsl info for stage2
Diffstat (limited to 'mdk-stage1/network.c')
| -rw-r--r-- | mdk-stage1/network.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index e3052b149..6cf24f626 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -169,7 +169,7 @@ int configure_net_device(struct interface_info * intf) intf->is_up = 1; - if (intf->boot_proto == BOOTPROTO_STATIC && !streq(intf->device, "lo")) { + if (intf->boot_proto != BOOTPROTO_DHCP && !streq(intf->device, "lo")) { /* I need to sleep a bit in order for kernel to finish init of the network device; if not, first sendto() for gethostbyaddr will get an EINVAL. */ @@ -303,12 +303,16 @@ static int save_netinfo(struct interface_info * intf) { if (intf->boot_proto == BOOTPROTO_DHCP) fprintf(f, "BOOTPROTO=dhcp\n"); - else { + else if (intf->boot_proto == BOOTPROTO_STATIC) { fprintf(f, "BOOTPROTO=static\n"); fprintf(f, "IPADDR=%s\n", inet_ntoa(intf->ip)); fprintf(f, "NETMASK=%s\n", inet_ntoa(intf->netmask)); fprintf(f, "NETWORK=%s\n", inet_ntoa(intf->network)); fprintf(f, "BROADCAST=%s\n", inet_ntoa(intf->broadcast)); + } else if (intf->boot_proto == BOOTPROTO_ADSL_PPPOE) { + fprintf(f, "BOOTPROTO=adsl_pppoe\n"); + fprintf(f, "USER=%s\n", intf->user); + fprintf(f, "PASS=%s\n", intf->pass); } fclose(f); @@ -437,8 +441,6 @@ static enum return_type setup_network_interface(struct interface_info * intf) return RETURN_ERROR; } else if (streq(choice, "ADSL")) { - intf->boot_proto = BOOTPROTO_STATIC; - results = perform_adsl(intf); if (results == RETURN_BACK) |