daemon: changes usage of running scripts using /bin/sh to bash to help provide consistency in what could be ran, added bash as a dependency in installation scripts, added bash as an executable check during startup

daemon/core/configservices/frrservices/services.py

@@ -65,7 +65,7 @@ class FRRZebra(ConfigService):
     ]
     executables: List[str] = ["zebra"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh frrboot.sh zebra"]
+    startup: List[str] = ["bash frrboot.sh zebra"]
     validate: List[str] = ["pidof zebra"]
     shutdown: List[str] = ["killall zebra"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING

daemon/core/configservices/nrlservices/services.py

@@ -14,7 +14,7 @@ class MgenSinkService(ConfigService):
     files: List[str] = ["mgensink.sh", "sink.mgen"]
     executables: List[str] = ["mgen"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh mgensink.sh"]
+    startup: List[str] = ["bash mgensink.sh"]
     validate: List[str] = ["pidof mgen"]
     shutdown: List[str] = ["killall mgen"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -36,7 +36,7 @@ class NrlNhdp(ConfigService):
     files: List[str] = ["nrlnhdp.sh"]
     executables: List[str] = ["nrlnhdp"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh nrlnhdp.sh"]
+    startup: List[str] = ["bash nrlnhdp.sh"]
     validate: List[str] = ["pidof nrlnhdp"]
     shutdown: List[str] = ["killall nrlnhdp"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -58,7 +58,7 @@ class NrlSmf(ConfigService):
     files: List[str] = ["startsmf.sh"]
     executables: List[str] = ["nrlsmf", "killall"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh startsmf.sh"]
+    startup: List[str] = ["bash startsmf.sh"]
     validate: List[str] = ["pidof nrlsmf"]
     shutdown: List[str] = ["killall nrlsmf"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -93,7 +93,7 @@ class NrlOlsr(ConfigService):
     files: List[str] = ["nrlolsrd.sh"]
     executables: List[str] = ["nrlolsrd"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh nrlolsrd.sh"]
+    startup: List[str] = ["bash nrlolsrd.sh"]
     validate: List[str] = ["pidof nrlolsrd"]
     shutdown: List[str] = ["killall nrlolsrd"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -117,7 +117,7 @@ class NrlOlsrv2(ConfigService):
     files: List[str] = ["nrlolsrv2.sh"]
     executables: List[str] = ["nrlolsrv2"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh nrlolsrv2.sh"]
+    startup: List[str] = ["bash nrlolsrv2.sh"]
     validate: List[str] = ["pidof nrlolsrv2"]
     shutdown: List[str] = ["killall nrlolsrv2"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -139,7 +139,7 @@ class OlsrOrg(ConfigService):
     files: List[str] = ["olsrd.sh", "/etc/olsrd/olsrd.conf"]
     executables: List[str] = ["olsrd"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh olsrd.sh"]
+    startup: List[str] = ["bash olsrd.sh"]
     validate: List[str] = ["pidof olsrd"]
     shutdown: List[str] = ["killall olsrd"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -161,7 +161,7 @@ class MgenActor(ConfigService):
     files: List[str] = ["start_mgen_actor.sh"]
     executables: List[str] = ["mgen"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh start_mgen_actor.sh"]
+    startup: List[str] = ["bash start_mgen_actor.sh"]
     validate: List[str] = ["pidof mgen"]
     shutdown: List[str] = ["killall mgen"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -176,7 +176,7 @@ class Arouted(ConfigService):
     files: List[str] = ["startarouted.sh"]
     executables: List[str] = ["arouted"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh startarouted.sh"]
+    startup: List[str] = ["bash startarouted.sh"]
     validate: List[str] = ["pidof arouted"]
     shutdown: List[str] = ["pkill arouted"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING

daemon/core/configservices/quaggaservices/services.py

@@ -65,7 +65,7 @@ class Zebra(ConfigService):
     ]
     executables: List[str] = ["zebra"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh quaggaboot.sh zebra"]
+    startup: List[str] = ["bash quaggaboot.sh zebra"]
     validate: List[str] = ["pidof zebra"]
     shutdown: List[str] = ["killall zebra"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING

daemon/core/configservices/securityservices/services.py

@@ -14,7 +14,7 @@ class VpnClient(ConfigService):
     files: List[str] = ["vpnclient.sh"]
     executables: List[str] = ["openvpn", "ip", "killall"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh vpnclient.sh"]
+    startup: List[str] = ["bash vpnclient.sh"]
     validate: List[str] = ["pidof openvpn"]
     shutdown: List[str] = ["killall openvpn"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -48,7 +48,7 @@ class VpnServer(ConfigService):
     files: List[str] = ["vpnserver.sh"]
     executables: List[str] = ["openvpn", "ip", "killall"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh vpnserver.sh"]
+    startup: List[str] = ["bash vpnserver.sh"]
     validate: List[str] = ["pidof openvpn"]
     shutdown: List[str] = ["killall openvpn"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -91,7 +91,7 @@ class IPsec(ConfigService):
     files: List[str] = ["ipsec.sh"]
     executables: List[str] = ["racoon", "ip", "setkey", "killall"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh ipsec.sh"]
+    startup: List[str] = ["bash ipsec.sh"]
     validate: List[str] = ["pidof racoon"]
     shutdown: List[str] = ["killall racoon"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -106,7 +106,7 @@ class Firewall(ConfigService):
     files: List[str] = ["firewall.sh"]
     executables: List[str] = ["iptables"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh firewall.sh"]
+    startup: List[str] = ["bash firewall.sh"]
     validate: List[str] = []
     shutdown: List[str] = []
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -121,7 +121,7 @@ class Nat(ConfigService):
     files: List[str] = ["nat.sh"]
     executables: List[str] = ["iptables"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh nat.sh"]
+    startup: List[str] = ["bash nat.sh"]
     validate: List[str] = []
     shutdown: List[str] = []
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING

daemon/core/configservices/utilservices/services.py

@@ -16,7 +16,7 @@ class DefaultRouteService(ConfigService):
     files: List[str] = ["defaultroute.sh"]
     executables: List[str] = ["ip"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh defaultroute.sh"]
+    startup: List[str] = ["bash defaultroute.sh"]
     validate: List[str] = []
     shutdown: List[str] = []
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -44,7 +44,7 @@ class DefaultMulticastRouteService(ConfigService):
     files: List[str] = ["defaultmroute.sh"]
     executables: List[str] = []
     dependencies: List[str] = []
-    startup: List[str] = ["sh defaultmroute.sh"]
+    startup: List[str] = ["bash defaultmroute.sh"]
     validate: List[str] = []
     shutdown: List[str] = []
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -66,7 +66,7 @@ class StaticRouteService(ConfigService):
     files: List[str] = ["staticroute.sh"]
     executables: List[str] = []
     dependencies: List[str] = []
-    startup: List[str] = ["sh staticroute.sh"]
+    startup: List[str] = ["bash staticroute.sh"]
     validate: List[str] = []
     shutdown: List[str] = []
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -94,7 +94,7 @@ class IpForwardService(ConfigService):
     files: List[str] = ["ipforward.sh"]
     executables: List[str] = ["sysctl"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh ipforward.sh"]
+    startup: List[str] = ["bash ipforward.sh"]
     validate: List[str] = []
     shutdown: List[str] = []
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -116,7 +116,7 @@ class SshService(ConfigService):
     files: List[str] = ["startsshd.sh", "/etc/ssh/sshd_config"]
     executables: List[str] = ["sshd"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh startsshd.sh"]
+    startup: List[str] = ["bash startsshd.sh"]
     validate: List[str] = []
     shutdown: List[str] = ["killall sshd"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -164,7 +164,7 @@ class DhcpClientService(ConfigService):
     files: List[str] = ["startdhcpclient.sh"]
     executables: List[str] = ["dhclient"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh startdhcpclient.sh"]
+    startup: List[str] = ["bash startdhcpclient.sh"]
     validate: List[str] = ["pidof dhclient"]
     shutdown: List[str] = ["killall dhclient"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
@@ -200,9 +200,9 @@ class PcapService(ConfigService):
     files: List[str] = ["pcap.sh"]
     executables: List[str] = ["tcpdump"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh pcap.sh start"]
+    startup: List[str] = ["bash pcap.sh start"]
     validate: List[str] = ["pidof tcpdump"]
-    shutdown: List[str] = ["sh pcap.sh stop"]
+    shutdown: List[str] = ["bash pcap.sh stop"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING
     default_configs: List[Configuration] = []
     modes: Dict[str, Dict[str, str]] = {}
@@ -249,7 +249,7 @@ class AtdService(ConfigService):
     files: List[str] = ["startatd.sh"]
     executables: List[str] = ["atd"]
     dependencies: List[str] = []
-    startup: List[str] = ["sh startatd.sh"]
+    startup: List[str] = ["bash startatd.sh"]
     validate: List[str] = ["pidof atd"]
     shutdown: List[str] = ["pkill atd"]
     validation_mode: ConfigServiceMode = ConfigServiceMode.BLOCKING