diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/type b/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/up b/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/up new file mode 100755 index 0000000..984224c --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/01-print-container-version/up @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/01-print-container-version diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/down b/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/down new file mode 100755 index 0000000..12913e6 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/down @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/02-remove-prometheus-data-down diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/type b/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/up b/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/up new file mode 100755 index 0000000..7bdc184 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/02-remove-prometheus-data/up @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/02-remove-prometheus-data-init diff --git a/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/down b/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/down new file mode 100755 index 0000000..11cbcdd --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/down @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/03-remove-mlathub-up-down diff --git a/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/type b/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/up b/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/up new file mode 100755 index 0000000..4c24c2e --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/03-remove-mlathub-up/up @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/03-remove-mlathub-up-init diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/type b/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/up b/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/up new file mode 100755 index 0000000..2f8e03c --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/50-store-uuid/up @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/50-store-uuid diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/type b/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/type @@ -0,0 +1 @@ +oneshot diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/up b/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/up new file mode 100755 index 0000000..fe58c47 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/60-mlathub-prep/up @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/60-mlathub-prep diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/01-print-container-version new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/02-remove-prometheus-data b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/02-remove-prometheus-data new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/03-remove-mlathub-up b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/03-remove-mlathub-up new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/50-store-uuid new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/dependencies.d/60-mlathub-prep new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/run b/rootfs/etc/s6-overlay/s6-rc.d/mlat-client/run new file mode 100755 index 0000000..5667649 --- /dev/null +++ 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 new file mode 100644 index 0000000..5883cff --- /dev/null +++ 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/mlathub/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/01-print-container-version new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/02-remove-prometheus-data b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/02-remove-prometheus-data new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/03-remove-mlathub-up b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/03-remove-mlathub-up new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/50-store-uuid new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/dependencies.d/60-mlathub-prep new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/run b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/run new file mode 100755 index 0000000..1957cb5 --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/mlathub diff --git a/rootfs/etc/s6-overlay/s6-rc.d/mlathub/type b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/mlathub/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/01-print-container-version new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/02-remove-prometheus-data b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/02-remove-prometheus-data new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/03-remove-mlathub-up b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/03-remove-mlathub-up new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/50-store-uuid new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/dependencies.d/60-mlathub-prep new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/run b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/run new file mode 100755 index 0000000..6f4275e --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/prometheus-readsb diff --git a/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/type b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/prometheus-readsb/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/01-print-container-version new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/02-remove-prometheus-data b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/02-remove-prometheus-data new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/03-remove-mlathub-up b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/03-remove-mlathub-up new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/50-store-uuid new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/readsb/dependencies.d/60-mlathub-prep new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/run b/rootfs/etc/s6-overlay/s6-rc.d/readsb/run new file mode 100755 index 0000000..d69791f --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/readsb/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec /etc/s6-overlay/scripts/readsb diff --git a/rootfs/etc/s6-overlay/s6-rc.d/readsb/type b/rootfs/etc/s6-overlay/s6-rc.d/readsb/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/rootfs/etc/s6-overlay/s6-rc.d/readsb/type @@ -0,0 +1 @@ +longrun diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-print-container-version b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-print-container-version new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/02-remove-prometheus-data b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/02-remove-prometheus-data new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/03-remove-mlathub-up b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/03-remove-mlathub-up new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-store-uuid b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-store-uuid new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/60-mlathub-prep b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/60-mlathub-prep new file mode 100644 index 0000000..e69de29 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 new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mlathub b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mlathub new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/prometheus-readsb b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/prometheus-readsb new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/readsb b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/readsb new file mode 100644 index 0000000..e69de29 diff --git a/rootfs/etc/cont-init.d/01-print-container-version b/rootfs/etc/s6-overlay/scripts/01-print-container-version similarity index 97% rename from rootfs/etc/cont-init.d/01-print-container-version rename to rootfs/etc/s6-overlay/scripts/01-print-container-version index ecc8742..a1d01c5 100755 --- a/rootfs/etc/cont-init.d/01-print-container-version +++ b/rootfs/etc/s6-overlay/scripts/01-print-container-version @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash disable=SC1091,SC2015 source /scripts/common diff --git a/rootfs/etc/cont-finish.d/02-remove-prometheus-data b/rootfs/etc/s6-overlay/scripts/02-remove-prometheus-data-down similarity index 78% rename from rootfs/etc/cont-finish.d/02-remove-prometheus-data rename to rootfs/etc/s6-overlay/scripts/02-remove-prometheus-data-down index 79dfa46..7c28688 100755 --- a/rootfs/etc/cont-finish.d/02-remove-prometheus-data +++ b/rootfs/etc/s6-overlay/scripts/02-remove-prometheus-data-down @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash disable=SC1091 source /scripts/common diff --git a/rootfs/etc/s6-overlay/scripts/02-remove-prometheus-data-init b/rootfs/etc/s6-overlay/scripts/02-remove-prometheus-data-init new file mode 100755 index 0000000..a676abf --- /dev/null +++ b/rootfs/etc/s6-overlay/scripts/02-remove-prometheus-data-init @@ -0,0 +1,7 @@ +#!/command/with-contenv bash +# shellcheck shell=bash disable=SC1091 + +# dummy file to allow for graceful shutdown +# I don't know if we need this, but it won't hurt anything + +exit 0 \ No newline at end of file diff --git a/rootfs/etc/cont-finish.d/03-remove-mlathub-up b/rootfs/etc/s6-overlay/scripts/03-remove-mlathub-up-down similarity index 97% rename from rootfs/etc/cont-finish.d/03-remove-mlathub-up rename to rootfs/etc/s6-overlay/scripts/03-remove-mlathub-up-down index 9608275..cb32365 100755 --- a/rootfs/etc/cont-finish.d/03-remove-mlathub-up +++ b/rootfs/etc/s6-overlay/scripts/03-remove-mlathub-up-down @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash #shellcheck shell=bash disable=SC2015,SC1091 source /scripts/common diff --git a/rootfs/etc/s6-overlay/scripts/03-remove-mlathub-up-init b/rootfs/etc/s6-overlay/scripts/03-remove-mlathub-up-init new file mode 100755 index 0000000..0f44202 --- /dev/null +++ b/rootfs/etc/s6-overlay/scripts/03-remove-mlathub-up-init @@ -0,0 +1,21 @@ +#!/command/with-contenv bash +#shellcheck shell=bash disable=SC2015,SC1091 + +# Remove MLATHub Up +#--------------------------------------------------------------------------------------------- +# Copyright (C) 2023, Ramon F. Kolb (kx1t) +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with this program. +# If not, see . +#--------------------------------------------------------------------------------------------- + +exit 0 \ No newline at end of file diff --git a/rootfs/etc/cont-init.d/50-store-uuid b/rootfs/etc/s6-overlay/scripts/50-store-uuid similarity index 97% rename from rootfs/etc/cont-init.d/50-store-uuid rename to rootfs/etc/s6-overlay/scripts/50-store-uuid index b1759e6..98ef0c6 100755 --- a/rootfs/etc/cont-init.d/50-store-uuid +++ b/rootfs/etc/s6-overlay/scripts/50-store-uuid @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash #shellcheck shell=bash disable=SC2015,SC1091 source /scripts/common diff --git a/rootfs/etc/cont-init.d/60-mlathub-prep b/rootfs/etc/s6-overlay/scripts/60-mlathub-prep similarity index 97% rename from rootfs/etc/cont-init.d/60-mlathub-prep rename to rootfs/etc/s6-overlay/scripts/60-mlathub-prep index ca5bfbb..bf7c9af 100755 --- a/rootfs/etc/cont-init.d/60-mlathub-prep +++ b/rootfs/etc/s6-overlay/scripts/60-mlathub-prep @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash #shellcheck shell=bash disable=SC2015,SC1091 source /scripts/common diff --git a/rootfs/etc/services.d/mlat-client/run b/rootfs/etc/s6-overlay/scripts/mlat-client similarity index 99% rename from rootfs/etc/services.d/mlat-client/run rename to rootfs/etc/s6-overlay/scripts/mlat-client index fcdb56d..2d08ac8 100755 --- a/rootfs/etc/services.d/mlat-client/run +++ b/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,SC2016 #--------------------------------------------------------------------------------------------- diff --git a/rootfs/etc/services.d/mlathub/run b/rootfs/etc/s6-overlay/scripts/mlathub similarity index 99% rename from rootfs/etc/services.d/mlathub/run rename to rootfs/etc/s6-overlay/scripts/mlathub index 828edea..4fbed2c 100755 --- a/rootfs/etc/services.d/mlathub/run +++ b/rootfs/etc/s6-overlay/scripts/mlathub @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash disable=SC1091,SC2015,SC2016 APPNAME="mlathub" diff --git a/rootfs/etc/services.d/prometheus-readsb/run b/rootfs/etc/s6-overlay/scripts/prometheus-readsb similarity index 94% rename from rootfs/etc/services.d/prometheus-readsb/run rename to rootfs/etc/s6-overlay/scripts/prometheus-readsb index 7f372ff..79f40d3 100755 --- a/rootfs/etc/services.d/prometheus-readsb/run +++ b/rootfs/etc/s6-overlay/scripts/prometheus-readsb @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash disable=SC1091 source /scripts/common diff --git a/rootfs/etc/services.d/readsb/run b/rootfs/etc/s6-overlay/scripts/readsb similarity index 99% rename from rootfs/etc/services.d/readsb/run rename to rootfs/etc/s6-overlay/scripts/readsb index 971ab1b..3da5d51 100755 --- a/rootfs/etc/services.d/readsb/run +++ b/rootfs/etc/s6-overlay/scripts/readsb @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bash +#!/command/with-contenv bash # shellcheck shell=bash disable=SC2015,SC2016,SC1091 APPNAME="readsb"