diff options
author | Derek Jennings <djennings@mageia.org> | 2013-08-27 11:57:04 +0100 |
---|---|---|
committer | Derek Jennings <djennings@mageia.org> | 2013-08-27 11:57:04 +0100 |
commit | 0d40a86deb661105949fd78ad74dc7554697094e (patch) | |
tree | f940075496bf4dc69e9502e579a5a7386e104bfa /common/Wizcommon.pm | |
parent | b66bff3521685687b0fb40995d46aa46a3b0f44e (diff) | |
download | drakwizard-0d40a86deb661105949fd78ad74dc7554697094e.tar drakwizard-0d40a86deb661105949fd78ad74dc7554697094e.tar.gz drakwizard-0d40a86deb661105949fd78ad74dc7554697094e.tar.bz2 drakwizard-0d40a86deb661105949fd78ad74dc7554697094e.tar.xz drakwizard-0d40a86deb661105949fd78ad74dc7554697094e.zip |
fix race condition checking service status (mga#10830)
Diffstat (limited to 'common/Wizcommon.pm')
-rw-r--r-- | common/Wizcommon.pm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/common/Wizcommon.pm b/common/Wizcommon.pm index 7e58107a..2fe045d0 100644 --- a/common/Wizcommon.pm +++ b/common/Wizcommon.pm @@ -27,7 +27,7 @@ use MDK::Common; use MDK::Wizard::IFCFG; our @ISA = qw(Exporter); -our @EXPORT = qw(check_started check_starts_on_boot test_host_domain); +our @EXPORT = qw(check_started check_starts_on_boot test_host_domain reload_or_restart); my $net; @@ -51,6 +51,15 @@ sub check_started { } } +sub reload_or_restart { + my ($service) = @_; + if (run_program::rooted($::prefix, '/bin/mountpoint', '-q', '/sys/fs/cgroup/systemd')) { + run_program::rooted($::prefix, '/bin/systemctl', 'reload-or-restart', "$service.service"); + } else { + run_program::rooted($::prefix, "/etc/rc.d/init.d/$service", "restart"); + } +} + sub check_starts_on_boot($$) { my ($in, $servicename) = @_; if (!services::starts_on_boot($servicename)) { |