From 9c4e0788e89157da0ee23503ab9563712c314089 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Tue, 12 Feb 2002 17:20:38 +0000
Subject: bug correction

---
 perl-install/network/network.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/network/network.pm')

diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 61828cdec..e8575c320 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -57,6 +57,7 @@ sub up_it {
     run_program::rooted($prefix, "/etc/rc.d/init.d/network", "start");
     $_->{isUp} = 1 foreach values %$intfs;
 }
+
 sub down_it {
     my ($prefix, $intfs) = @_;
     run_program::rooted($prefix, "/etc/rc.d/init.d/network", "stop");
@@ -66,7 +67,11 @@ sub down_it {
 sub write_conf {
     my ($file, $netc) = @_;
 
-   ($netc->{DOMAINNAME}) ||= 'localdomain';
+    if ($netc->{HOSTNAME}) {
+	$netc->{HOSTNAME} =~ /^[^\.]\.(.*)$/;
+	$1 and $netc->{DOMAINNAME} = $1;
+    }
+    ($netc->{DOMAINNAME}) ||= 'localdomain';
     add2hash($netc, {
 		     NETWORKING => "yes",
 		     FORWARD_IPV4 => "false",
-- 
cgit v1.2.1