From d939c1f4174b5d6153c26f018c087264d7a0e886 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Mon, 7 Nov 2005 17:10:45 +0000
Subject: set hostname only after packages have been installed, or else
 graphical urpmi may fail

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

diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 67dd579bf..9624c1c11 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -104,7 +104,6 @@ sub write_network_conf {
     $net->{network}{NETWORKING} = 'yes';
 
     setVarsInSh($::prefix . $network_file, $net->{network}, qw(HOSTNAME NETWORKING GATEWAY GATEWAYDEV NISDOMAIN FORWARD_IPV4 NETWORKING_IPV6 IPV6_DEFAULTDEV));
-    $net->{network}{HOSTNAME} && !$::isInstall and sethostname($net);
 }
 
 sub write_zeroconf {
@@ -608,6 +607,8 @@ sub configure_network {
         require network::shorewall;
         my $shorewall = network::shorewall::read();
         $shorewall && !$shorewall->{disabled} and network::shorewall::write($shorewall);
+
+        $net->{network}{HOSTNAME} && !$::isInstall and sethostname($net);
     }
 
     #- make net_applet reload the configuration
-- 
cgit v1.2.1