Force hybrid mode packetd and classd

classd/files/classd.init

@@ -12,12 +12,8 @@ start_service() {
     # procd_set_param env GODEBUG=schedtrace=30000
     # procd_set_param env GODEBUG=schedtrace=30000,scheddetail=1
 
-    # if not hybrid mode, start the packetd
-    if [ -e /etc/config/hybrid ]
-    then
-        # procd command to run
-        procd_set_param command  /usr/bin/classd -mfw -w65536 -d
-    fi
+    # procd command to run
+    procd_set_param command  /usr/bin/classd -mfw -w65536 -d
 
     # restart indefinitely if crashed, 5 seconds between attempts
     procd_set_param respawn 3600 5 0

packetd/files/packetd.init

@@ -19,21 +19,18 @@ start_service() {
     # as output goes to logd which will add timestamps
 
     # if not hybrid mode, start the packetd 
-    if [ ! -e /etc/config/hybrid ]
+    if [ -e /etc/config/dpdk ]
     then
-        if [ -e /etc/config/dpdk ]
-        then
-        # TODO if dpdk/bess is enabled we load packetd from bess as a dynamic library.
-        # But for not just start it normally.
-            procd_set_param command /usr/bin/packetd --no-timestamp
-        else
-            procd_set_param command /usr/bin/packetd --no-timestamp
-        fi
-        # procd_set_param command /usr/bin/packetd --logfile /tmp/log/packetd.log
-
-        # restart indefinitely if crashed, 5 seconds between attempts
-        procd_set_param respawn 3600 5 0
+    # TODO if dpdk/bess is enabled we load packetd from bess as a dynamic library.
+    # But for not just start it normally.
+        #procd_set_param command /usr/bin/packetd --no-timestamp
+    else
+        #procd_set_param command /usr/bin/packetd --no-timestamp
     fi
+    # procd_set_param command /usr/bin/packetd --logfile /tmp/log/packetd.log
+
+    # restart indefinitely if crashed, 5 seconds between attempts
+    procd_set_param respawn 3600 5 0
 
     # stdout to system log
     procd_set_param stdout 1