X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Finit.d%2Fsfa;h=73b228e4d2834deb8685c104311473184549cd6f;hb=14f0f13bfc6f6e2bf99e85e6f4c5c040427fd0bd;hp=1cae56ef37c313911db5694f7daa667a51ee35ae;hpb=6d28b9fd79f1b71844feae744ceef40fb8d6a086;p=sfa.git

diff --git a/sfa/init.d/sfa b/sfa/init.d/sfa
index 1cae56ef..73b228e4 100755
--- a/sfa/init.d/sfa
+++ b/sfa/init.d/sfa
@@ -54,42 +54,41 @@ reload ()
 #	mkdir -p /etc/sfa/php
 #	plc-config --php  /etc/sfa/sfa_config.xml >/etc/sfa/php/sfa_config.php
 #    fi
+
+    # [re]generate the sfa_component_config
+    gen-sfa-cm-config.py        
 }
 
 start() {
     
     reload
 
-    echo -n $"Starting SFA:  "
-
-    if [ "$SFA_REGISTRY_ENABLED" ]; then
-        echo "Registry"
-        daemon /usr/bin/sfa-server.py -r -d $OPTIONS
+    if [ "$SFA_REGISTRY_ENABLED" -eq 1 ]; then
+        action $"SFA Registry" daemon /usr/bin/sfa-server.py -r -d $OPTIONS
     fi
 
-    if [ "$SFA_AGGREGATE_ENABLED" ]; then
-        echo "Aggregate"
-        daemon /usr/bin/sfa-server.py -a -d $OPTIONS
+    if [ "$SFA_AGGREGATE_ENABLED" -eq 1 ]; then
+        action $"SFA Aggregate" daemon /usr/bin/sfa-server.py -a -d $OPTIONS
     fi
         
-    if [ "$SFA_SM_ENABLED" ]; then
-        echo "SliceMgr"
-        daemon /usr/bin/sfa-server.py -s -d $OPTIONS
+    if [ "$SFA_SM_ENABLED" -eq 1 ]; then
+        action "SFA SliceMgr" daemon /usr/bin/sfa-server.py -s -d $OPTIONS
+    fi
+
+    if [ "$SFA_FLASHPOLICY_ENABLED" -eq 1 ]; then
+        action "Flash Policy Server" daemon /usr/bin/sfa_flashpolicy.py --file="$SFA_FLASHPOLICY_CONFIG_FILE" --port=$SFA_FLASHPOLICY_PORT -d
     fi
 
     RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa
+    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sfa-server.py
 
 }
 
 stop() {
-    echo -n $"Shutting down SFA: "
-    killproc sfa-server.py
+    action $"Shutting down SFA" killproc sfa-server.py
     RETVAL=$?
 
-    echo
-    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa
+    [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sfa-server.py
 }
 
 
@@ -99,13 +98,13 @@ case "$1" in
     reload) reload force ;;
     restart) stop; start ;;
     condrestart)
-	if [ -f /var/lock/subsys/sfa ]; then
+	if [ -f /var/lock/subsys/sfa-server.py ]; then
             stop
             start
 	fi
 	;;
     status)
-	status sfa
+	status sfa-server.py
 	RETVAL=$?
 	;;
     *)