diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-09-20 07:23:34 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-09-20 07:23:34 +0000 |
| commit | e9a04001fb0c22a7acece733c78d2d88d4b1e366 (patch) | |
| tree | 5e7120fc1d62eebfba2fba6676a20c1320118c6e | |
| parent | 918170227fcbcb7107fb365dd5dcf93af709d21f (diff) | |
| download | drakx-backup-do-not-use-e9a04001fb0c22a7acece733c78d2d88d4b1e366.tar drakx-backup-do-not-use-e9a04001fb0c22a7acece733c78d2d88d4b1e366.tar.gz drakx-backup-do-not-use-e9a04001fb0c22a7acece733c78d2d88d4b1e366.tar.bz2 drakx-backup-do-not-use-e9a04001fb0c22a7acece733c78d2d88d4b1e366.tar.xz drakx-backup-do-not-use-e9a04001fb0c22a7acece733c78d2d88d4b1e366.zip | |
move "Start at boot" step for lan-like adsl/cable connections
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 8bb338a69..1f19cade0 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -200,7 +200,7 @@ sub real_main { }; my $goto_start_on_boot_ifneeded = sub { - return $after_start_on_boot_step->() if $need_restart_network; + return $after_start_on_boot_step->() if $netcnx->{type} eq "lan"; return "isdn_dial_on_boot" if $netcnx->{type} =~ /isdn/; return "network_on_boot"; }; @@ -977,7 +977,9 @@ notation (for example, 1.2.3.4).")), ), { text => N("Track network card id (useful for laptops)"), val => \$track_network_id, type => "bool" }, { text => N("Network Hotplugging"), val => \$hotplug, type => "bool" }, - { text => N("Start at boot"), val => \$onboot, type => "bool" }, + if_($netcnx->{type} eq "lan", + { text => N("Start at boot"), val => \$onboot, type => "bool" }, + ), if_($auto_ip, { label => N("DHCP client"), val => \$netc->{dhcp_client}, list => [ qw(dhcp-client dhcpcd pump dhcpxd) ], advanced => 1 }, |