From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Thu, 16 Jan 2014 09:11:51 +0000 (+0100)
Subject: fix misleading comments that improperly refer to vsliver_vs on an lxc node
X-Git-Tag: nodemanager-5.2-10~11
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=716cbd2dbcf887e7eea05053a04cae3ddef7073a

fix misleading comments that improperly refer to vsliver_vs on an lxc node
---

diff --git a/initscript.py b/initscript.py
index b52c79b..5dd15c8 100644
--- a/initscript.py
+++ b/initscript.py
@@ -31,14 +31,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 +46,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 +54,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))