diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-07-29 13:38:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-07-29 13:38:59 +0000 |
| commit | f63e28d2c82b6d7d1daa1961eccb63c83f46c901 (patch) | |
| tree | 64dcf70f1f659a006592807dd8e6c277db2cb13e | |
| parent | efdd2c7205a92de5f6bb4beef8baa5eb7212ecc3 (diff) | |
| download | drakx-f63e28d2c82b6d7d1daa1961eccb63c83f46c901.tar drakx-f63e28d2c82b6d7d1daa1961eccb63c83f46c901.tar.gz drakx-f63e28d2c82b6d7d1daa1961eccb63c83f46c901.tar.bz2 drakx-f63e28d2c82b6d7d1daa1961eccb63c83f46c901.tar.xz drakx-f63e28d2c82b6d7d1daa1961eccb63c83f46c901.zip | |
(remove_initscript) simplify
| -rw-r--r-- | perl-install/network/tools.pm | 9 |
1 files 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 { |