From ad5e218a59c23ff444108d0e24643d590710b298 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 17 Sep 2004 07:50:15 +0000
Subject: (configureNetwork2) use services do disable zeroconf, do not disable
 if it doesn't exist (to avoid warnings in console)

---
 perl-install/network/network.pm | 6 +++++-
 1 file changed, 5 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 c3faf7ae9..2962a8a83 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -446,7 +446,11 @@ sub configureNetwork2 {
             $in->do_pkgs->ensure_binary_is_installed('tmdns', 'tmdns', 'auto') if !$in->do_pkgs->is_installed('bind');
             $in->do_pkgs->ensure_binary_is_installed('zcip', 'zcip', 'auto');
             write_zeroconf("$etc/tmdns.conf", $netc->{ZEROCONF_HOSTNAME}); 
-        } else { run_program::rooted($::prefix, "chkconfig", "--del", $_) foreach qw(tmdns zcip) }  # disable zeroconf
+        } else {
+            #- disable zeroconf
+            require services;
+            -f "/etc/rc.d/init.d/$_" and services::do_not_start_service_on_boot($_) foreach qw(tmdns zcip)
+        }
         any { $_->{BOOTPROTO} =~ /^(pump|bootp)$/ } values %$intf and $in->do_pkgs->install('pump');
     }
 }
-- 
cgit v1.2.1