X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=initscript.py;h=52096ebf32761bd9b7e49391ea89a8edb77e18c9;hb=89c268a4481d0d93946c61b03f0190c1bcb3ae9d;hp=7a270daaeeb8d5f837142a2d3e811e0b53628ab8;hpb=4a64676042177ee6c9435a9c60ba3db90e3c17d0;p=nodemanager.git

diff --git a/initscript.py b/initscript.py
index 7a270da..52096eb 100644
--- a/initscript.py
+++ b/initscript.py
@@ -24,13 +24,10 @@ class Initscript:
         # says we should do either one or the other and not both
         # but actually if that was true we could just do it for init and be fine
         # which is not what we've seen starting with f18
-        # so for now let's try to do it for both systems unconditionnally
-        #
-        # this being said all the paths do not necessarily exist on all flavours of rootfs
-        try:    self.install_and_enable_vinit_for_init ()
-        except: pass
+        # so we try for a systemd system, and if it fails it means 
+        # one of the dir does not exist and so we are dealing with an init-based rootfs
         try:    self.install_and_enable_vinit_for_systemd ()
-        except: pass
+        except: self.install_and_enable_vinit_for_init ()
 
     # unconditionnally install and enable the generic vinit script
     # mimicking chkconfig for enabling the generic vinit script