backport required vinit support from master

diff --git a/NodeManager.spec b/NodeManager.spec
index b1e2760..af66d41 100644 (file)
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -67,6 +67,11 @@ local operations on slices.
 rm -rf $RPM_BUILD_ROOT
 %{__make} %{?_smp_mflags} install DESTDIR="$RPM_BUILD_ROOT"
 
+# install the sliver initscript (that triggers the slice initscript if any)
+mkdir -p $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/
+rsync -av sliver-initscripts/ $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/
+chmod 755 $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/
+
 install -D -m 755 conf_files.init $RPM_BUILD_ROOT/%{_initrddir}/conf_files
 install -D -m 755 fuse-pl.init $RPM_BUILD_ROOT/%{_initrddir}/fuse-pl
 install -D -m 755 nm.init $RPM_BUILD_ROOT/%{_initrddir}/nm

diff --git a/sliver_vs.py b/sliver_vs.py
index 1322173..9a329cc 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -156,35 +156,62 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         new_initscript = rec['initscript']
         if new_initscript != self.initscript:
             self.initscript = new_initscript
-            self.initscriptchanged = True
+            # not used anymore, we always check against the installed script
+            #self.initscriptchanged = True
+            self.refresh_slice_vinit()
 
         accounts.Account.configure(self, rec)  # install ssh keys
 
+    # unconditionnally install and enable the generic vinit script
+    # mimicking chkconfig for enabling the generic vinit script
+    # this is hardwired for runlevel 3
+    def install_and_enable_vinit (self):
+        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
+        rc3_target="../init.d/vinit"
+        # install in sliver
+        body=file(vinit_source).read()
+        if tools.replace_file_with_string(vinit_script,body,chmod=0755):
+            logger.log("vsliver_vs: %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))
+                os.symlink(rc3_target,rc3_link)
+            except:
+                logger.log_exc("vsliver_vs: %s: failed to create runlevel3 symlink %s"%rc3_link)
+
+    # this one checks for the existence of the slice initscript
+    # install or remove the slice inistscript, as instructed by the initscript tag
+    def refresh_slice_vinit(self):
+        body=self.initscript
+        sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice"%self.name
+        if tools.replace_file_with_string(sliver_initscript,body,remove_if_empty=True,chmod=0755):
+            if body:
+                logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
+            else:
+                logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))
+
     def start(self, delay=0):
-        if self.rspec['enabled'] > 0:
-            logger.log('%s: starting in %d seconds' % (self.name, delay))
+        if self.rspec['enabled'] <= 0:
+            logger.log('sliver_vs: not starting %s, is not enabled'%self.name)
+        else:
+            logger.log('sliver_vs: %s: starting in %d seconds' % (self.name, delay))
             time.sleep(delay)
-            # VServer.start calls fork() internally, 
-            # so just close the nonstandard fds and fork once to avoid creating zombies
+            # the generic /etc/init.d/vinit script is permanently refreshed, and enabled
+            self.install_and_enable_vinit()
+            # if a change has occured in the slice initscript, reflect this in /etc/init.d/vinit.slice
+            self.refresh_slice_vinit()
             child_pid = os.fork()
             if child_pid == 0:
-                if self.initscriptchanged:
-                    logger.log('%s: installing initscript' % self.name)
-                    def install_initscript():
-                        flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
-                        fd = os.open('/etc/rc.vinit', flags, 0755)
-                        os.write(fd, self.initscript)
-                        os.close(fd)
-                    try:
-                        self.chroot_call(install_initscript)
-                    except: logger.log_exc(self.name)
+                # VServer.start calls fork() internally,
+                # so just close the nonstandard fds and fork once to avoid creating zombies
                 tools.close_nonstandard_fds()
                 vserver.VServer.start(self)
                 os._exit(0)
-            else: 
+            else:
                 os.waitpid(child_pid, 0)
-                self.initscriptchanged = False
-        else: logger.log('%s: not starting, is not enabled' % self.name)
 
     def stop(self):
         logger.log('%s: stopping' % self.name)