Merge pull request #60 from sdr-enthusiasts/s6

s6 migration
sdr-enthusiasts · Aug 31, 2023 · 4adde13 · 4adde13
2 parents 8b08de8 + a06fb76
commit 4adde13
Show file tree

Hide file tree

Showing 26 changed files with 20 additions and 5 deletions.
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-vrs/type b/rootfs/etc/s6-overlay/s6-rc.d/50-vrs/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/50-vrs/up b/rootfs/etc/s6-overlay/s6-rc.d/50-vrs/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/50-vrs
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-marker/type b/rootfs/etc/s6-overlay/s6-rc.d/60-marker/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/60-marker/up b/rootfs/etc/s6-overlay/s6-rc.d/60-marker/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/60-marker
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/61-layer/type b/rootfs/etc/s6-overlay/s6-rc.d/61-layer/type
@@ -0,0 +1 @@
+oneshot
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/61-layer/up b/rootfs/etc/s6-overlay/s6-rc.d/61-layer/up
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/61-layer
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/dependencies.d/50-vrs b/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/dependencies.d/50-vrs
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/dependencies.d/60-marker b/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/dependencies.d/60-marker
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/dependencies.d/61-layer b/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/dependencies.d/61-layer
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/run b/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/autoupdate
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/type b/rootfs/etc/s6-overlay/s6-rc.d/autoupdate/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-vrs b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/50-vrs
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/60-marker b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/60-marker
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/61-layer b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/61-layer
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/autoupdate b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/autoupdate
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/vrs b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/vrs
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/vrs/dependencies.d/50-vrs b/rootfs/etc/s6-overlay/s6-rc.d/vrs/dependencies.d/50-vrs
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/vrs/dependencies.d/60-marker b/rootfs/etc/s6-overlay/s6-rc.d/vrs/dependencies.d/60-marker
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/vrs/dependencies.d/61-layer b/rootfs/etc/s6-overlay/s6-rc.d/vrs/dependencies.d/61-layer
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/vrs/run b/rootfs/etc/s6-overlay/s6-rc.d/vrs/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /etc/s6-overlay/scripts/vrs
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/vrs/type b/rootfs/etc/s6-overlay/s6-rc.d/vrs/type
@@ -0,0 +1 @@
+longrun
diff --git a/rootfs/etc/cont-init.d/50-vrs → rootfs/etc/s6-overlay/scripts/50-vrs b/rootfs/etc/cont-init.d/50-vrs → rootfs/etc/s6-overlay/scripts/50-vrs
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 #shellcheck shell=bash disable=SC2034,SC2164,SC2015
 
 APPNAME="$(hostname)/vrs-init"

diff --git a/rootfs/etc/cont-init.d/60-marker → rootfs/etc/s6-overlay/scripts/60-marker b/rootfs/etc/cont-init.d/60-marker → rootfs/etc/s6-overlay/scripts/60-marker
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 APPNAME="$(hostname)/vrs-ccmarker"

diff --git a/rootfs/etc/cont-init.d/61-layer → rootfs/etc/s6-overlay/scripts/61-layer b/rootfs/etc/cont-init.d/61-layer → rootfs/etc/s6-overlay/scripts/61-layer
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 APPNAME="$(hostname)/vrs-cclayer"

diff --git a/rootfs/etc/services.d/autoupdate/run → rootfs/etc/s6-overlay/scripts/autoupdate b/rootfs/etc/services.d/autoupdate/run → rootfs/etc/s6-overlay/scripts/autoupdate
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 #shellcheck shell=bash disable=SC2128
 
 APPNAME="$(hostname)/autoupdate"

diff --git a/rootfs/etc/services.d/vrs/run → rootfs/etc/s6-overlay/scripts/vrs b/rootfs/etc/services.d/vrs/run → rootfs/etc/s6-overlay/scripts/vrs
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 #shellcheck shell=bash disable=SC2015
 
 APPNAME="$(hostname)/vrs-runtime"