diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-03-04 12:14:40 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-03-04 12:14:40 +0000 |
| commit | 39d8501d5aba64dad8cf46e22e0c6323b22504bc (patch) | |
| tree | e0da2b6f638e2dd7b4f4bd384649f1e6e98c5d0b | |
| parent | e17bdd82d43373bcf7c93dc3f2a266213f175e18 (diff) | |
| download | drakx-backup-do-not-use-39d8501d5aba64dad8cf46e22e0c6323b22504bc.tar drakx-backup-do-not-use-39d8501d5aba64dad8cf46e22e0c6323b22504bc.tar.gz drakx-backup-do-not-use-39d8501d5aba64dad8cf46e22e0c6323b22504bc.tar.bz2 drakx-backup-do-not-use-39d8501d5aba64dad8cf46e22e0c6323b22504bc.tar.xz drakx-backup-do-not-use-39d8501d5aba64dad8cf46e22e0c6323b22504bc.zip | |
add @network::ethernet::dhcp_clients
| -rw-r--r-- | perl-install/network/ethernet.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index 21cfc6708..bb08738ae 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -9,6 +9,8 @@ use common; use run_program; use network::tools; +our @dhcp_clients = qw(dhcp-client dhcpcd pump dhcpxd); + sub write_ether_conf { my ($in, $modules_conf, $netcnx, $netc, $intf) = @_; configureNetwork2($in, $modules_conf, $::prefix, $netc, $intf); diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 74f04ccef..1e33ce282 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -1027,7 +1027,7 @@ notation (for example, 1.2.3.4).")), ), if_($auto_ip, { label => N("DHCP client"), val => \$netc->{dhcp_client}, - list => [ qw(dhcp-client dhcpcd pump dhcpxd) ], advanced => 1 }, + list => \@network::ethernet::dhcp_clients, advanced => 1 }, { label => N("DHCP timeout (in seconds)"), val => \$ethntf->{DHCP_TIMEOUT}, advanced => 1 }, { text => N("Get DNS servers from DHCP"), val => \$peerdns, type => "bool", advanced => 1 }, { text => N("Get YP server from DHCP"), val => \$peeryp, type => "bool", advanced => 1 }, |