File fix-http-check-on-SUSE-platform.patch of Package cobbler
From c00bf0bb3a6e5d88cd581dd9abb11d5930f32d76 Mon Sep 17 00:00:00 2001
From: Flavio Castelli <fcastelli@suse.com>
Date: Tue, 9 Jul 2013 10:24:10 +0200
Subject: [PATCH] Fix http check on SUSE platform. Addresses bnc#828453
On SUSE platform Apache's binary is called 'httpd2'.
This addresses one of the issues reported by bnc#828453.
---
cobbler/action_check.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: cobbler-2.2.2/cobbler/action_check.py
===================================================================
--- cobbler-2.2.2.orig/cobbler/action_check.py
+++ cobbler-2.2.2/cobbler/action_check.py
@@ -290,8 +290,10 @@ class BootCheck:
"""
Check if Apache is installed.
"""
- if self.checked_dist in [ "suse", "redhat" ]:
+ if self.checked_dist == "redhat":
rc = utils.subprocess_get(self.logger,"httpd -v")
+ elif self.checked_dist == "suse":
+ rc = utils.subprocess_get(self.logger,"httpd2 -v")
else:
rc = utils.subprocess_get(self.logger,"apache2 -v")
if rc.find("Server") == -1: