diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-08 07:48:12 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-08 07:48:12 +0000 |
| commit | fb70f14761372aaa6291230c89bbba0396225d8b (patch) | |
| tree | 04b5aecde44639a22e709ec7967ca3d3f2e1a52a | |
| parent | bd4c3d7f7956db221225a1798cb245d5c9cb2c81 (diff) | |
| download | drakx-fb70f14761372aaa6291230c89bbba0396225d8b.tar drakx-fb70f14761372aaa6291230c89bbba0396225d8b.tar.gz drakx-fb70f14761372aaa6291230c89bbba0396225d8b.tar.bz2 drakx-fb70f14761372aaa6291230c89bbba0396225d8b.tar.xz drakx-fb70f14761372aaa6291230c89bbba0396225d8b.zip | |
fix lan always marked as detected even when no detection was performed
or when there's no ethernet devices
btw, generalize this "fix" to all net connection types.
rationale: since we've already check if we've devices, there's no
point in doing another different check in order to add the string "-
detected" so let's just consolidate the previous test, this will
prevent such bug to come back again
| -rw-r--r-- | perl-install/network/netconnect.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index c25470e27..a051dba74 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -120,12 +120,12 @@ If you don't want to use the auto detection, deselect the checkbox. step_2: my @l = ( - [ join('', N("Normal modem connection"), if_($netc->{autodetect}{modem}, " - " . N("detected on port %s", $netc->{autodetect}{modem}))), \$conf{modem} ], - [ join('', N("Winmodem connection"), if_($netc->{autodetect}{winmodem}, " - " . N("detected"))), \$conf{winmodem} ], - [ join('', N("ISDN connection"), if_($netc->{autodetect}{isdn}{description}, " - " . N("detected %s", $netc->{autodetect}{isdn}{description}))), \$conf{isdn} ], - [ join('', N("ADSL connection"), if_($netc->{autodetect}{adsl}, " - " . N("detected"))), \$conf{adsl} ], - [ join('', N("Cable connection"), if_($netc->{autodetect}{cable}, " - " . N("cable connection detected"))), \$conf{cable} ], - [ join('', N("LAN connection"), if_($netc->{autodetect}{lan}, " - " . N("ethernet card(s) detected"))), \$conf{lan} ] + [ join('', N("Normal modem connection"), if_($conf{modem}, " - " . N("detected on port %s", $netc->{autodetect}{modem}))), \$conf{modem} ], + [ join('', N("Winmodem connection"), if_($conf{winmodem}, " - " . N("detected"))), \$conf{winmodem} ], + [ join('', N("ISDN connection"), if_($conf{isdn}, " - " . N("detected %s", $netc->{autodetect}{isdn}{description}))), \$conf{isdn} ], + [ join('', N("ADSL connection"), if_($conf{adsl}, " - " . N("detected"))), \$conf{adsl} ], + [ join('', N("Cable connection"), if_($conf{cable}, " - " . N("cable connection detected"))), \$conf{cable} ], + [ join('', N("LAN connection"), if_($conf{lan}, " - " . N("ethernet card(s) detected"))), \$conf{lan} ] ); eval { $in->ask_from_({ title => N("Network Configuration Wizard"), messages => N("Choose the connection you want to configure"), |