Check if systemd is currently running (Fixes #118)

CHANGELOG.md

@@ -5,7 +5,9 @@
 ### Fixed
 - Fixed some crashes when pcs encounters a non-ascii character in environment
   variables, command line arguments and so on ([rhbz#1435697])
+- Fixed detecting if systemd is in use ([ghissue#118])
 
+[ghissue#118]: https://github.com/ClusterLabs/pcs/issues/118
 [rhbz#1435697]: https://bugzilla.redhat.com/show_bug.cgi?id=1435697
 
 

Makefile

@@ -29,23 +29,14 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
   EXTRA_SETUP_OPTS="--install-layout=deb"
 endif
 
-# Check for systemd presence, add compatibility with Debian based distros
-IS_SYSTEMCTL=false
-
-ifeq ($(IS_DEBIAN),true)
-  IS_SYSTEMCTL = $(shell if [ -d /var/run/systemd/system ] ; then echo true ; else echo false; fi)
-  ifeq ($(IS_SYSTEMCTL),false)
-    ifeq ($(SYSTEMCTL_OVERRIDE),true)
-      IS_SYSTEMCTL=true
-    endif
-  endif
+# Check for systemd presence
+ifeq ($(SYSTEMCTL_OVERRIDE),true)
+  IS_SYSTEMCTL=true
 else
-  ifeq ("$(wildcard /usr/bin/systemctl)","/usr/bin/systemctl")
-    IS_SYSTEMCTL=true
+  ifeq ($(SYSTEMCTL_OVERRIDE),false)
+    IS_SYSTEMCTL=false
   else
-    ifeq ("$(wildcard /bin/systemctl)","/usr/bin/systemctl")
-      IS_SYSTEMCTL=true
-    endif
+    IS_SYSTEMCTL = $(shell if [ -d /run/systemd/system ] || [ -d /var/run/systemd/system ] ; then echo true ; else echo false; fi)
   endif
 endif
 

pcsd/bootstrap.rb

@@ -25,13 +25,11 @@ def is_rhel6()
 
 def is_systemctl()
   systemctl_paths = [
-      '/usr/bin/systemctl',
-      '/bin/systemctl',
-      '/var/run/systemd/system',
       '/run/systemd/system',
+      '/var/run/systemd/system',
   ]
   systemctl_paths.each { |path|
-    return true if File.exist?(path)
+    return true if File.directory?(path)
   }
   return false
 end
@@ -78,6 +76,12 @@ def configure_logger(log_device)
   else
     logger.debug "Did not detect RHEL 6"
   end
+
+  if ISSYSTEMCTL
+    logger.debug "Detected systemd is in use"
+  else
+    logger.debug "Detected systemd is not in use"
+  end
   return logger
 end