diff --git a/rootfs/etc/init.d/beast-splitter b/rootfs/etc/init.d/beast-splitter index 5d4d00d..c178f0c 100755 --- a/rootfs/etc/init.d/beast-splitter +++ b/rootfs/etc/init.d/beast-splitter @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/command/with-contenv sh # "dummy" SysV-style init script, to allow piaware to restart beast-splitter. # piaware calls SysV init script to restart beast-splitter (package/fa_services.tcl invoke_service_action). diff --git a/rootfs/etc/init.d/dump1090 b/rootfs/etc/init.d/dump1090 index 1641c6b..8aa3461 100755 --- a/rootfs/etc/init.d/dump1090 +++ b/rootfs/etc/init.d/dump1090 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/command/with-contenv sh # "dummy" SysV-style init script, to allow piaware to restart dump1090. # piaware calls SysV init script to restart dump1090 (package/fa_services.tcl invoke_service_action). diff --git a/rootfs/etc/init.d/dump978 b/rootfs/etc/init.d/dump978 index 62b3976..f043f3f 100755 --- a/rootfs/etc/init.d/dump978 +++ b/rootfs/etc/init.d/dump978 @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/command/with-contenv sh # "dummy" SysV-style init script, to allow piaware to restart dump978. # piaware calls SysV init script to restart dump978 (package/fa_services.tcl invoke_service_action). diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-piaware/type b/rootfs/etc/s6-overlay/s6-rc.d/01-piaware/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/01-piaware/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-piaware/up b/rootfs/etc/s6-overlay/s6-rc.d/01-piaware/up new file mode 100755 index 0000000..ccb604a --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/01-piaware/up @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/01-piaware diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/run b/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/run new file mode 100755 index 0000000..7fd0193 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/978raw-splitter diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/type b/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/978raw-splitter/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/run b/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/run new file mode 100755 index 0000000..325e1f9 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/beast-splitter diff --git a/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/type b/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/beast-splitter/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dump1090/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/dump1090/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dump1090/run b/rootfs/etc/s6-overlay/s6-rc.d/dump1090/run new file mode 100755 index 0000000..901dcf6 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/dump1090/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/dump1090 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dump1090/type b/rootfs/etc/s6-overlay/s6-rc.d/dump1090/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/dump1090/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dump978/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/dump978/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dump978/run b/rootfs/etc/s6-overlay/s6-rc.d/dump978/run new file mode 100755 index 0000000..2fb4175 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/dump978/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/dump978 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/dump978/type b/rootfs/etc/s6-overlay/s6-rc.d/dump978/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/dump978/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/dependencies.d/piaware b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/dependencies.d/piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/run b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/run new file mode 100755 index 0000000..f623f28 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/piaware-log diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/type b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/piaware-log/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/piaware/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware/run b/rootfs/etc/s6-overlay/s6-rc.d/piaware/run new file mode 100755 index 0000000..261037b --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/piaware/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/piaware diff --git a/rootfs/etc/s6-overlay/s6-rc.d/piaware/type b/rootfs/etc/s6-overlay/s6-rc.d/piaware/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/piaware/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/skyaware/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/skyaware/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/skyaware/run b/rootfs/etc/s6-overlay/s6-rc.d/skyaware/run new file mode 100755 index 0000000..0c45454 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/skyaware/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/skyaware diff --git a/rootfs/etc/s6-overlay/s6-rc.d/skyaware/type b/rootfs/etc/s6-overlay/s6-rc.d/skyaware/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/skyaware/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/dependencies.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/dependencies.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/dependencies.d/978raw-splitter b/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/dependencies.d/978raw-splitter new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/run b/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/run new file mode 100755 index 0000000..2c3fe1e --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/skyaware978 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/type b/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/skyaware978/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-piaware b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/978raw-splitter b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/978raw-splitter new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/beast-splitter b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/beast-splitter new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/dump1090 b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/dump1090 new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/dump978 b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/dump978 new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/piaware b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/piaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/piaware-log b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/piaware-log new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/skyaware b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/skyaware new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/skyaware978 b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/skyaware978 new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/cont-init.d/01-piaware b/rootfs/etc/s6-overlay/scripts/01-piaware similarity index 98% rename from rootfs/etc/cont-init.d/01-piaware rename to rootfs/etc/s6-overlay/scripts/01-piaware index 0ce6b4f..1f92586 100755 --- a/rootfs/etc/cont-init.d/01-piaware +++ b/rootfs/etc/s6-overlay/scripts/01-piaware @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash # Remove existing piaware config diff --git a/rootfs/etc/services.d/978raw-splitter/run b/rootfs/etc/s6-overlay/scripts/978raw-splitter similarity index 93% rename from rootfs/etc/services.d/978raw-splitter/run rename to rootfs/etc/s6-overlay/scripts/978raw-splitter index 791d1ab..6cfca78 100755 --- a/rootfs/etc/services.d/978raw-splitter/run +++ b/rootfs/etc/s6-overlay/scripts/978raw-splitter @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash set -eo pipefail diff --git a/rootfs/etc/services.d/beast-splitter/run b/rootfs/etc/s6-overlay/scripts/beast-splitter similarity index 95% rename from rootfs/etc/services.d/beast-splitter/run rename to rootfs/etc/s6-overlay/scripts/beast-splitter index b8fe31b..81c3257 100755 --- a/rootfs/etc/services.d/beast-splitter/run +++ b/rootfs/etc/s6-overlay/scripts/beast-splitter @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash set -eo pipefail diff --git a/rootfs/etc/services.d/dump1090/run b/rootfs/etc/s6-overlay/scripts/dump1090 similarity index 98% rename from rootfs/etc/services.d/dump1090/run rename to rootfs/etc/s6-overlay/scripts/dump1090 index 35f5e94..aa7c059 100755 --- a/rootfs/etc/services.d/dump1090/run +++ b/rootfs/etc/s6-overlay/scripts/dump1090 @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash set -eo pipefail diff --git a/rootfs/etc/services.d/dump978/run b/rootfs/etc/s6-overlay/scripts/dump978 similarity index 98% rename from rootfs/etc/services.d/dump978/run rename to rootfs/etc/s6-overlay/scripts/dump978 index 9b775c6..2ec6509 100755 --- a/rootfs/etc/services.d/dump978/run +++ b/rootfs/etc/s6-overlay/scripts/dump978 @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash #shellcheck shell=bash # Don't continue if UAT not used diff --git a/rootfs/etc/services.d/piaware/run b/rootfs/etc/s6-overlay/scripts/piaware similarity index 94% rename from rootfs/etc/services.d/piaware/run rename to rootfs/etc/s6-overlay/scripts/piaware index 268aa9f..88d006c 100755 --- a/rootfs/etc/services.d/piaware/run +++ b/rootfs/etc/s6-overlay/scripts/piaware @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash set -eo pipefail diff --git a/rootfs/etc/services.d/piaware/log/run b/rootfs/etc/s6-overlay/scripts/piaware-log similarity index 100% rename from rootfs/etc/services.d/piaware/log/run rename to rootfs/etc/s6-overlay/scripts/piaware-log diff --git a/rootfs/etc/services.d/skyaware/run b/rootfs/etc/s6-overlay/scripts/skyaware similarity index 91% rename from rootfs/etc/services.d/skyaware/run rename to rootfs/etc/s6-overlay/scripts/skyaware index a8afd07..1dae569 100755 --- a/rootfs/etc/services.d/skyaware/run +++ b/rootfs/etc/s6-overlay/scripts/skyaware @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash # Depends on dump1090 diff --git a/rootfs/etc/services.d/skyaware978/run b/rootfs/etc/s6-overlay/scripts/skyaware978 similarity index 95% rename from rootfs/etc/services.d/skyaware978/run rename to rootfs/etc/s6-overlay/scripts/skyaware978 index d9e597f..b7c062b 100755 --- a/rootfs/etc/services.d/skyaware978/run +++ b/rootfs/etc/s6-overlay/scripts/skyaware978 @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash #shellcheck shell=bash # Don't continue if UAT not used diff --git a/rootfs/scripts/healthcheck.sh b/rootfs/scripts/healthcheck.sh index 76231ad..7a448d9 100755 --- a/rootfs/scripts/healthcheck.sh +++ b/rootfs/scripts/healthcheck.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash # Exit abnormally for any error