From 9eb1688b18e4241692b80afd363cdce2a1b1b844 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Thu, 10 Jan 2002 15:26:26 +0000
Subject: domainname corection

---
 perl-install/network/network.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/network')

diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index ee62d089d..cfcb9ac31 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -66,12 +66,12 @@ sub down_it {
 sub write_conf {
     my ($file, $netc) = @_;
 
+   ($netc->{DOMAINNAME}) ||= 'localdomain';
     add2hash($netc, {
 		     NETWORKING => "yes",
 		     FORWARD_IPV4 => "false",
-		     HOSTNAME => "localhost.localdomain",
+		     HOSTNAME => "localhost.$netc->{DOMAINNAME}",
 		    });
-   ($netc->{DOMAINNAME}) ||= ($netc->{HOSTNAME} =~ /\.(.*)/);
 
     setVarsInSh($file, $netc, qw(NETWORKING FORWARD_IPV4 DHCP_HOSTNAME HOSTNAME DOMAINNAME GATEWAY GATEWAYDEV NISDOMAIN));
 }
-- 
cgit v1.2.1