diff options
| author | Eugeni Dodonov <eugeni@mandriva.org> | 2009-06-25 14:54:41 +0000 |
|---|---|---|
| committer | Eugeni Dodonov <eugeni@mandriva.org> | 2009-06-25 14:54:41 +0000 |
| commit | 4cf8e149729b8a76ae5ec93f078d2eea43f9af9c (patch) | |
| tree | 9be49b161e50c8783c8f1a17cb0457a5e0eedb40 /lib/network | |
| parent | 9534590f7c7369280302724bedc736a38acb3c05 (diff) | |
| download | drakx-net-4cf8e149729b8a76ae5ec93f078d2eea43f9af9c.tar drakx-net-4cf8e149729b8a76ae5ec93f078d2eea43f9af9c.tar.gz drakx-net-4cf8e149729b8a76ae5ec93f078d2eea43f9af9c.tar.bz2 drakx-net-4cf8e149729b8a76ae5ec93f078d2eea43f9af9c.tar.xz drakx-net-4cf8e149729b8a76ae5ec93f078d2eea43f9af9c.zip | |
Show default hostname when no hostname was defined, to have visual
feedback on what will be used if user does not changes the hostname
(#35143, #38557, #47364).
Diffstat (limited to 'lib/network')
| -rw-r--r-- | lib/network/connection/ethernet.pm | 2 | ||||
| -rw-r--r-- | lib/network/netconnect.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/network/connection/ethernet.pm b/lib/network/connection/ethernet.pm index 1722da7..d764f4d 100644 --- a/lib/network/connection/ethernet.pm +++ b/lib/network/connection/ethernet.pm @@ -209,6 +209,8 @@ sub guess_hostname_settings { sub get_hostname_settings { my ($self) = @_; my $auto_hostname = sub { $self->{protocol} eq 'dhcp' && $self->{address}{needhostname} }; + # configure the default hostname so the hostname setting should be more obvious to the users + $self->{address}{hostname} = 'localhost.localdomain' unless $self->{address}{hostname}; [ if_($self->{protocol} eq 'dhcp', { text => N("Assign host name from DHCP server (or generate a unique one)"), val => \$self->{address}{needhostname}, type => "bool" }, diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm index 895ed0a..e12caa2 100644 --- a/lib/network/netconnect.pm +++ b/lib/network/netconnect.pm @@ -265,8 +265,8 @@ If you do not know it, keep the preselected protocol.") }, pre => sub { $address_settings = $connection->can('get_address_settings') && $connection->get_address_settings; $connection->guess_address_settings if $connection->can('guess_address_settings'); - $hostname_settings = $connection->can('get_hostname_settings') && $connection->get_hostname_settings; $connection->guess_hostname_settings if $connection->can('guess_hostname_settings'); + $hostname_settings = $connection->can('get_hostname_settings') && $connection->get_hostname_settings; }, name => sub { $net->{type}->get_type_name . "\n\n" . $connection->get_address_settings_label }, data => sub { [ @$address_settings, @$hostname_settings ] }, |