X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscript.py;h=2d054fbfa4d31fd52738f8d01df0bb5ffa3ba9a6;hb=bedf4d3c114fa912a3533d325a366abfb458a36e;hp=8e6e4a3e095d3720b9c2031fabb1f0a98428e5d5;hpb=0fc41ff1973ac16a261c90767173cb8343f3faa2;p=nodemanager.git

diff --git a/initscript.py b/initscript.py
index 8e6e4a3..2d054fb 100644
--- a/initscript.py
+++ b/initscript.py
@@ -70,6 +70,24 @@ class Initscript:
         """
         suitable for systemd-based VMs
         """
+
+        ##########
+        ########## initscripts : current status - march 2015
+        ##########
+        #
+        # the initscripts business worked smoothly up to f18 incusive
+        # with f20 and the apparition of machinectl, things started to
+        # behave really weird
+        #
+        # so starting with f20, after having tried pretty hard to get this right,
+        # but to no success obviously, and in order to stay on the safe side
+        # of the force, I am turning off the initscript machinery completely
+        # that is to say: the vinit.service does not get installed at all installed
+        # 
+        if os.path.isfile('/usr/bin/machinectl'):
+            logger.log("WARNING: initscripts are not supported anymore in nodes that have machinectl")
+            return
+
         vinit_source = "/usr/share/NodeManager/sliver-systemd/vinit.service"
         vinit_unit_file = "/vservers/%s/usr/lib/systemd/system/vinit.service" % self.name
         enable_link = "/vservers/%s/etc/systemd/system/multi-user.target.wants/vinit.service" % self.name