From f63e28d2c82b6d7d1daa1961eccb63c83f46c901 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 29 Jul 2004 13:38:59 +0000 Subject: (remove_initscript) simplify --- perl-install/network/tools.pm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm index 57cf647ea..0e5439594 100644 --- a/perl-install/network/tools.pm +++ b/perl-install/network/tools.pm @@ -145,14 +145,11 @@ sub check_link_beat() { sub remove_initscript() { $::testing and return; - -e "$::prefix/etc/rc.d/init.d/internet" and do { - $::isStandalone ? system("/sbin/chkconfig --del internet") : do { - rm_rf("$::prefix/etc/rc.d/rc$_") foreach '0.d/K11internet', '1.d/K11internet', '2.d/K11internet', - '3.d/S89internet', '5.d/S89internet', '6.d/K11internet'; - }; + if (-e "$::prefix/etc/rc.d/init.d/internet") { + run_program::rooted($::prefix, "/sbin/chkconfig", "--del", "internet"); rm_rf("$::prefix/etc/rc.d/init.d/internet"); log::explanations("Removed internet service"); - }; + } } sub use_windows { -- cgit v1.2.1