Testing simplified s6v3 config

1activegeek · Jul 16, 2024 · 1df8abc · 1df8abc
1 parent 5aaf186
commit 1df8abc
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 32 deletions.
diff --git a/root/etc/s6-overlay/s6-rc.d/init-airconnect/airconnect-setup.sh b/root/etc/s6-overlay/s6-rc.d/init-airconnect/airconnect-setup.sh
diff --git a/root/etc/s6-overlay/s6-rc.d/init-airconnect/run b/root/etc/s6-overlay/s6-rc.d/init-airconnect/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-airconnect/type b/root/etc/s6-overlay/s6-rc.d/init-airconnect/type
diff --git a/root/etc/s6-overlay/s6-rc.d/init-airconnect/up b/root/etc/s6-overlay/s6-rc.d/init-airconnect/up
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-aircast/dependencies.d/init-airconnect b/root/etc/s6-overlay/s6-rc.d/svc-aircast/dependencies.d/init-airconnect
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-aircast/run b/root/etc/s6-overlay/s6-rc.d/svc-aircast/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-airconnect/run b/root/etc/s6-overlay/s6-rc.d/svc-airconnect/run
@@ -0,0 +1,23 @@
+#!/usr/bin/with-contenv bash
+
+# Check for VAR - default, kill, custom
+if [ -z "$AIRUPNP_VAR" ]; then
+  echo "No AIRUPNP_VAR present, continuing with standard airupnp launch variables"
+  exec /bin/airupnp-linux-x86_64 -l 1000:2000
+elif [ "$AIRUPNP_VAR" = "kill" ]; then
+  echo "AIRUPNP_VAR set to kill, skipping airupnp service launch"
+else
+  echo "AIRUPNP_VAR present, using custom user airupnp launch variables"
+  exec /bin/airupnp-linux-x86_64 "$AIRUPNP_VAR"
+fi
+
+# Check for VAR - default, kill, custom
+if [ -z "$AIRCAST_VAR" ]; then
+  echo "No AIRCAST_VAR present, continuing with standard aircast launch variables"
+  exec /bin/aircast-linux-x86_64
+elif [ "$AIRCAST_VAR" = "kill" ]; then
+  echo "AIRCAST_VAR set to kill, skipping aircast service launch"
+else
+  echo "AIRCAST_VAR present, using custom user aircast launch variables"
+  exec /bin/aircast-linux-x86_64 "$AIRCAST_VAR"
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-aircast/type → ...tc/s6-overlay/s6-rc.d/svc-airconnect/type b/root/etc/s6-overlay/s6-rc.d/svc-aircast/type → ...tc/s6-overlay/s6-rc.d/svc-airconnect/type
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-airconnect/up b/root/etc/s6-overlay/s6-rc.d/svc-airconnect/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/svc-airconnect/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-airupnp/dependencies.d/init-airconnect b/root/etc/s6-overlay/s6-rc.d/svc-airupnp/dependencies.d/init-airconnect
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-airupnp/run b/root/etc/s6-overlay/s6-rc.d/svc-airupnp/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-airupnp/type b/root/etc/s6-overlay/s6-rc.d/svc-airupnp/type
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-airconnect b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-airconnect
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-airupnp b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-airupnp