s6 (#23)

sdr-enthusiasts · Aug 28, 2023 · 734d534 · 734d534
1 parent 1d546d6
commit 734d534
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 4 deletions.
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-pfclient/type b/rootfs/etc/s6-overlay/s6-rc.d/01-pfclient/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-pfclient/up b/rootfs/etc/s6-overlay/s6-rc.d/01-pfclient/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/01-pfclient
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/logwatcher/dependencies.d/01-pfclient b/rootfs/etc/s6-overlay/s6-rc.d/logwatcher/dependencies.d/01-pfclient
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/logwatcher/run b/rootfs/etc/s6-overlay/s6-rc.d/logwatcher/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/logwatcher
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/logwatcher/type b/rootfs/etc/s6-overlay/s6-rc.d/logwatcher/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/pfclient/dependencies.d/01-pfclient b/rootfs/etc/s6-overlay/s6-rc.d/pfclient/dependencies.d/01-pfclient
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/pfclient/run b/rootfs/etc/s6-overlay/s6-rc.d/pfclient/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/pfclient
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/pfclient/type b/rootfs/etc/s6-overlay/s6-rc.d/pfclient/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-pfclient b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-pfclient
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/logwatcher b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/logwatcher
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/pfclient b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/pfclient
diff --git a/rootfs/etc/cont-init.d/01-pfclient → rootfs/etc/s6-overlay/scripts/01-pfclient b/rootfs/etc/cont-init.d/01-pfclient → rootfs/etc/s6-overlay/scripts/01-pfclient
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 # Check to make sure the correct command line arguments have been set

diff --git a/rootfs/etc/services.d/logwatcher/run → rootfs/etc/s6-overlay/scripts/logwatcher b/rootfs/etc/services.d/logwatcher/run → rootfs/etc/s6-overlay/scripts/logwatcher
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 #shellcheck shell=bash
 
 sleep 5

diff --git a/rootfs/etc/services.d/pfclient/run → rootfs/etc/s6-overlay/scripts/pfclient b/rootfs/etc/services.d/pfclient/run → rootfs/etc/s6-overlay/scripts/pfclient
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 #shellcheck shell=bash
 
 # Test pfclient can run natively (without qemu)

diff --git a/rootfs/scripts/healthcheck.sh b/rootfs/scripts/healthcheck.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 
 # Import healthchecks-framework
 # shellcheck disable=SC1091