about to duplicate install_and_enable_vinit for init and systemd

[nodemanager.git] / initscript.py

diff --git a/initscript.py b/initscript.py
index 9682170..e2aada5 100644 (file)
--- a/initscript.py
+++ b/initscript.py
@@ -12,7 +12,7 @@ class Initscript:
         self.initscript = ''
 
     def configure (self, rec):
-        logger.log("Initscript.configure")
+#        logger.log("Initscript.configure")
         new_initscript = rec['initscript']
         if new_initscript != self.initscript:
             self.initscript = new_initscript
@@ -24,6 +24,10 @@ class Initscript:
     # mimicking chkconfig for enabling the generic vinit script
     # this is hardwired for runlevel 3
     def install_and_enable_vinit (self):
+        self.install_and_enable_vinit_for_init ()
+
+    def install_and_enable_vinit_for_init ():
+        "suitable for init-based VMs"
         vinit_source="/usr/share/NodeManager/sliver-initscripts/vinit"
         vinit_script="/vservers/%s/etc/rc.d/init.d/vinit"%self.name
         rc3_link="/vservers/%s/etc/rc.d/rc3.d/S99vinit"%self.name
@@ -31,14 +35,14 @@ class Initscript:
         # install in sliver
         code=file(vinit_source).read()
         if tools.replace_file_with_string(vinit_script,code,chmod=0755):
-            logger.log("vsliver_vs: %s: installed generic vinit rc script"%self.name)
+            logger.log("Initscript: %s: installed generic vinit rc script"%self.name)
         # create symlink for runlevel 3
         if not os.path.islink(rc3_link):
             try:
-                logger.log("vsliver_vs: %s: creating runlevel3 symlink %s"%(self.name,rc3_link))
+                logger.log("Initscript: %s: creating runlevel3 symlink %s"%(self.name,rc3_link))
                 os.symlink(rc3_target,rc3_link)
             except:
-                logger.log_exc("vsliver_vs: %s: failed to create runlevel3 symlink %s"%rc3_link)
+                logger.log_exc("Initscript: %s: failed to create runlevel3 symlink %s"%rc3_link)
 
     # install or remove the slice inistscript, as instructed by the initscript tag
     def refresh_slice_vinit(self):
@@ -46,7 +50,7 @@ class Initscript:
         sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice"%self.name
         if tools.replace_file_with_string(sliver_initscript,code,remove_if_empty=True,chmod=0755):
             if code:
-                logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
+                logger.log("Initscript: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
                 if self.is_running():
                     # Only need to rerun the initscript if the vserver is
                     # already running. If the vserver isn't running, then the
@@ -54,5 +58,5 @@ class Initscript:
                     # /etc/rc.d/vinit when the vserver is started.
                     self.rerun_slice_vinit()
             else:
-                logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))
+                logger.log("Initscript: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))