Merge pull request #40 from sdr-enthusiasts/s6

s6
sdr-enthusiasts · Aug 29, 2023 · 433af1d · 433af1d
2 parents 787d004 + 9625ac3
commit 433af1d
Show file tree

Hide file tree

Showing 27 changed files with 21 additions and 6 deletions.
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-radarvirtuel/type b/rootfs/etc/s6-overlay/s6-rc.d/50-radarvirtuel/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-radarvirtuel/up b/rootfs/etc/s6-overlay/s6-rc.d/50-radarvirtuel/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/50-radarvirtuel
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/55-mlat-client/type b/rootfs/etc/s6-overlay/s6-rc.d/55-mlat-client/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/55-mlat-client/up b/rootfs/etc/s6-overlay/s6-rc.d/55-mlat-client/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/55-mlat-client
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/imalive/dependencies.d/50-radarvirtuel b/rootfs/etc/s6-overlay/s6-rc.d/imalive/dependencies.d/50-radarvirtuel
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/imalive/dependencies.d/55-mlat-client b/rootfs/etc/s6-overlay/s6-rc.d/imalive/dependencies.d/55-mlat-client
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/imalive/run b/rootfs/etc/s6-overlay/s6-rc.d/imalive/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/imalive
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/imalive/type b/rootfs/etc/s6-overlay/s6-rc.d/imalive/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/50-radarvirtuel b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/50-radarvirtuel
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/55-mlat-client b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/55-mlat-client
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/run b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/mlat-client
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/type b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/dependencies.d/50-radarvirtuel b/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/dependencies.d/50-radarvirtuel
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/dependencies.d/55-mlat-client b/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/dependencies.d/55-mlat-client
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/run b/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/radarvirtuel
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/type b/rootfs/etc/s6-overlay/s6-rc.d/radarvirtuel/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-radarvirtuel b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-radarvirtuel
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/55-mlat-client b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/55-mlat-client
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/imalive b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/imalive
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mlat-client b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mlat-client
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/radarvirtuel b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/radarvirtuel
diff --git a/rootfs/etc/cont-init.d/50-radarvirtuel → ...fs/etc/s6-overlay/scripts/50-radarvirtuel b/rootfs/etc/cont-init.d/50-radarvirtuel → ...fs/etc/s6-overlay/scripts/50-radarvirtuel
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash disable=SC1091,SC2015,SC2145
 
 source /scripts/common

diff --git a/rootfs/etc/cont-init.d/55-mlat-client → rootfs/etc/s6-overlay/scripts/55-mlat-client b/rootfs/etc/cont-init.d/55-mlat-client → rootfs/etc/s6-overlay/scripts/55-mlat-client
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash disable=SC1091,SC2015,SC2145
 
 source /scripts/common

diff --git a/rootfs/etc/services.d/imalive/run → rootfs/etc/s6-overlay/scripts/imalive b/rootfs/etc/services.d/imalive/run → rootfs/etc/s6-overlay/scripts/imalive
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash disable=SC1091,SC2015,SC2145
 
 source /scripts/common

diff --git a/rootfs/etc/services.d/mlat-client/run → rootfs/etc/s6-overlay/scripts/mlat-client b/rootfs/etc/services.d/mlat-client/run → rootfs/etc/s6-overlay/scripts/mlat-client
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash disable=SC1091,SC2015,SC2145
 
 source /scripts/common

diff --git a/rootfs/etc/services.d/radarvirtuel/run → rootfs/etc/s6-overlay/scripts/radarvirtuel b/rootfs/etc/services.d/radarvirtuel/run → rootfs/etc/s6-overlay/scripts/radarvirtuel
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash disable=SC1091,SC2015,SC2145
 
 source /scripts/common

diff --git a/rootfs/home/healthcheck/healthcheck.sh b/rootfs/home/healthcheck/healthcheck.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/command/with-contenv bash
 
 # Import healthchecks-framework
 source /opt/healthchecks-framework/healthchecks.sh