From 1753ad8cc2cd7239a9daf6daa09d356477565790 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Thu, 26 Jul 2007 16:22:01 -0400 Subject: Fix init script return codes for 'status' and also make service status checks aware of cobblerd being running or not. --- cobbler/action_check.py | 3 ++- config/cobblerd | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cobbler/action_check.py b/cobbler/action_check.py index e44d92c..d07b5b4 100644 --- a/cobbler/action_check.py +++ b/cobbler/action_check.py @@ -47,7 +47,8 @@ class BootCheck: self.check_service(status,"dnsmasq") else: status.append(_("manage_dhcp_mode in /var/lib/cobbler/settings should be 'isc' or 'dnsmasq'")) - + self.check_service(status, "cobblerd") + self.check_bootloaders(status) self.check_tftpd_bin(status) self.check_tftpd_dir(status) diff --git a/config/cobblerd b/config/cobblerd index e32fcfc..0338a3b 100755 --- a/config/cobblerd +++ b/config/cobblerd @@ -54,7 +54,7 @@ mystatus() { fi echo "cobblerd is stopped" echo - return 0 + return 3 } # See how we were called. -- cgit