S6 (#175)

* initial * fix service
sdr-enthusiasts · Aug 28, 2023 · 121257c · 121257c
1 parent d1f854e
commit 121257c
Show file tree

Hide file tree

Showing 42 changed files with 25 additions and 22 deletions.
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-show-rbfeeder-changelog/type b/rootfs/etc/s6-overlay/s6-rc.d/01-show-rbfeeder-changelog/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/01-show-rbfeeder-changelog/up b/rootfs/etc/s6-overlay/s6-rc.d/01-show-rbfeeder-changelog/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/01-show-rbfeeder-changelog
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-rbfeeder/type b/rootfs/etc/s6-overlay/s6-rc.d/02-rbfeeder/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/02-rbfeeder/up b/rootfs/etc/s6-overlay/s6-rc.d/02-rbfeeder/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/02-rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/03-show-architecture/type b/rootfs/etc/s6-overlay/s6-rc.d/03-show-architecture/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/03-show-architecture/up b/rootfs/etc/s6-overlay/s6-rc.d/03-show-architecture/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/03-show-architecture
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/dependencies.d/01-show-rbfeeder-changelog b/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/dependencies.d/01-show-rbfeeder-changelog
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/dependencies.d/02-rbfeeder b/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/dependencies.d/02-rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/dependencies.d/03-show-architecture b/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/dependencies.d/03-show-architecture
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/run b/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/978json-splitter
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/type b/rootfs/etc/s6-overlay/s6-rc.d/978json-splitter/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/01-show-rbfeeder-changelog b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/01-show-rbfeeder-changelog
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/02-rbfeeder b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/02-rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/03-show-architecture b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/03-show-architecture
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/rbfeeder b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/dependencies.d/rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/run b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/rbfeeder-log
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/type b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder-log/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/dependencies.d/01-show-rbfeeder-changelog b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/dependencies.d/01-show-rbfeeder-changelog
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/dependencies.d/02-rbfeeder b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/dependencies.d/02-rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/dependencies.d/03-show-architecture b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/dependencies.d/03-show-architecture
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/run b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/type b/rootfs/etc/s6-overlay/s6-rc.d/rbfeeder/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/stats/dependencies.d/01-show-rbfeeder-changelog b/rootfs/etc/s6-overlay/s6-rc.d/stats/dependencies.d/01-show-rbfeeder-changelog
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/stats/dependencies.d/02-rbfeeder b/rootfs/etc/s6-overlay/s6-rc.d/stats/dependencies.d/02-rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/stats/dependencies.d/03-show-architecture b/rootfs/etc/s6-overlay/s6-rc.d/stats/dependencies.d/03-show-architecture
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/stats/run b/rootfs/etc/s6-overlay/s6-rc.d/stats/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/stats
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/stats/type b/rootfs/etc/s6-overlay/s6-rc.d/stats/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-show-rbfeeder-changelog b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/01-show-rbfeeder-changelog
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/02-rbfeeder b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/02-rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/03-show-architecture b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/03-show-architecture
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/978json-splitter b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/978json-splitter
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/rbfeeder b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/rbfeeder
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/rbfeeder-log b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/rbfeeder-log
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/stats b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/stats
diff --git a/...cont-init.d/01-show-rbfeeder-changelog.sh → ...verlay/scripts/01-show-rbfeeder-changelog b/...cont-init.d/01-show-rbfeeder-changelog.sh → ...verlay/scripts/01-show-rbfeeder-changelog
diff --git a/rootfs/etc/cont-init.d/02-rbfeeder.sh → rootfs/etc/s6-overlay/scripts/02-rbfeeder b/rootfs/etc/cont-init.d/02-rbfeeder.sh → rootfs/etc/s6-overlay/scripts/02-rbfeeder
@@ -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/...s/etc/cont-init.d/03-show-architecture.sh → ...c/s6-overlay/scripts/03-show-architecture b/...s/etc/cont-init.d/03-show-architecture.sh → ...c/s6-overlay/scripts/03-show-architecture
diff --git a/rootfs/etc/services.d/978json-splitter/run → ...s/etc/s6-overlay/scripts/978json-splitter b/rootfs/etc/services.d/978json-splitter/run → ...s/etc/s6-overlay/scripts/978json-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/rbfeeder/run → rootfs/etc/s6-overlay/scripts/rbfeeder b/rootfs/etc/services.d/rbfeeder/run → rootfs/etc/s6-overlay/scripts/rbfeeder
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 #shellcheck shell=bash
 #shellcheck disable=SC2016
 

diff --git a/rootfs/etc/services.d/rbfeeder/log/run → rootfs/etc/s6-overlay/scripts/rbfeeder-log b/rootfs/etc/services.d/rbfeeder/log/run → rootfs/etc/s6-overlay/scripts/rbfeeder-log
diff --git a/rootfs/etc/services.d/stats/run → rootfs/etc/s6-overlay/scripts/stats b/rootfs/etc/services.d/stats/run → rootfs/etc/s6-overlay/scripts/stats
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 #shellcheck shell=bash
 
 sleep $((STATS_INTERVAL_MINUTES * 60))

diff --git a/rootfs/etc/services.d.disabled/cpu-serial-workaround-checker/run b/rootfs/etc/services.d.disabled/cpu-serial-workaround-checker/run