improved initscript

[tests.git] / system / config_default.py

diff --git a/system/config_default.py b/system/config_default.py
index 162a25e..4ef3777 100644 (file)
--- a/system/config_default.py
+++ b/system/config_default.py
@@ -150,25 +150,31 @@ def keys (options,index):
 
 ############################## initscripts
 initscript_by_name="""#! /bin/sh
-builtin="the_script_name"
-stamp=/tmp/$builtin.stamp
 command=$1; shift
 slicename=$1; shift
-case $command in 
-start)
-  (echo Starting test initscript: $builtin on slicename $slicename ; date) >> $stamp
+stamp="the_script_name"
+stampfile=/tmp/$stamp.stamp
+
+echo "Running initscript with command=$command and slicename=$slicename"
+
+function start () {
+  (echo Starting test initscript: $stamp on slicename $slicename ; date) >> $stampfile
   echo "This is the stdout of the sliver $slicename initscript $command (exp. start) pid=$$" 
   echo "This is the stderr of the sliver $slicename initscript $command (exp. start) pid=$$" 1>&2
-;;
-stop)
-  rm $stamp
-;;
-restart)
-  echo "Dummy restart"
-;;
-*)
-  echo "Unknown command in initscript $command"
-;;
+}
+function stop () {
+  echo "Removing stamp $stampfile"
+  rm -f $stampfile
+}
+function restart () {
+  stop
+  start
+}
+case $command in 
+start) start ;;
+stop) stop ;;
+restart) restart ;;
+*) echo "Unknown command in initscript $command" ;;
 esac
 """
 
@@ -206,7 +212,7 @@ def slices (options,index):
             slice_spec['initscriptname']='the_script_name'
             slice_spec['initscriptstamp']='the_script_name'
         return slice_spec
-    return [ theslice(1) for i in range (2*index-1,2*index+1) ]
+    return [ theslice(i) for i in range (2*index-1,2*index+1) ]
 
 def all_slicenames (options,index):
     return [ slice['slice_fields']['name'] for slice in slices(options,index)]