diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-05-19 13:13:21 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-05-19 13:13:21 +0000 |
commit | 89c443eaf88e7d0f1c169e66b5779a95f4aff598 (patch) | |
tree | 456db116da9ef9412d8622162e99535f7dc080d1 | |
parent | ffe6c8587419746bbcd8ee958f443b41bf153fbf (diff) | |
download | drakx-backup-do-not-use-89c443eaf88e7d0f1c169e66b5779a95f4aff598.tar drakx-backup-do-not-use-89c443eaf88e7d0f1c169e66b5779a95f4aff598.tar.gz drakx-backup-do-not-use-89c443eaf88e7d0f1c169e66b5779a95f4aff598.tar.bz2 drakx-backup-do-not-use-89c443eaf88e7d0f1c169e66b5779a95f4aff598.tar.xz drakx-backup-do-not-use-89c443eaf88e7d0f1c169e66b5779a95f4aff598.zip |
move expert stuff under the "advanced" button like in all other drakx/drakxtools code
-rw-r--r-- | perl-install/network/network.pm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 977122fa8..7d684aa4e 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -338,15 +338,14 @@ notation (for example, 1.2.3.4)."); (N("Configuring network device %s", $intf->{DEVICE}) . ($module ? N(" (driver %s)", $module) : '') . "\n\n") . $text, [ { label => N("Automatic IP"), val => \$auto_ip, type => "bool", text => N("(bootp/dhcp/zeroconf)") }, - { label => N("IP address"), val => \$intf->{IPADDR}, disabled => sub { $auto_ip } }, + { label => N("IP address"), val => \$intf->{IPADDR}, disabled => sub { $auto_ip } }, { label => N("Netmask"), val => \$intf->{NETMASK}, disabled => sub { $auto_ip } }, - if_($::expert, - { label => N("DHCP host name"), val => \$intf->{DHCP_HOSTNAME}, disabled => sub { ! $auto_ip } }, - { label => N("Track network card id (useful for laptops)"), val => \$track_network_id, type => "bool" }, - { label => N("Network Hotplugging"), val => \$hotplug, type => "bool" }, - { label => N("Assign host name from DHCP address"), val => \$needhostname, type => "bool", disabled => sub { ! $auto_ip } }, - { label => N("Start at boot"), val => \$onboot, type => "bool" }), + { label => N("DHCP host name"), val => \$intf->{DHCP_HOSTNAME}, disabled => sub { ! $auto_ip }, advanced => 1 }, + { label => N("Track network card id (useful for laptops)"), val => \$track_network_id, type => "bool", advanced => 1 }, + { label => N("Network Hotplugging"), val => \$hotplug, type => "bool", advanced => 1 }, + { label => N("Assign host name from DHCP address"), val => \$needhostname, type => "bool", disabled => sub { ! $auto_ip }, advanced => 1 }, + { label => N("Start at boot"), val => \$onboot, type => "bool", advanced => 1 }, if_($intf->{wireless_eth}, { label => "WIRELESS_MODE", val => \$intf->{WIRELESS_MODE}, list => [ "Ad-hoc", "Managed", "Master", "Repeater", "Secondary", "Auto" ] }, { label => "WIRELESS_ESSID", val => \$intf->{WIRELESS_ESSID} }, |