use new s6-rc layout

2022-02-15 15:35:17 +01:00 · 2022-02-15 15:35:17 +01:00 · eaec10c401
commit eaec10c401
parent b13f5acdb8
10 changed files with 21 additions and 19 deletions
--- a/rootfs/etc/cont-init.d/02-murmur
+++ b/rootfs/etc/cont-init.d/02-murmur
@ -1,3 +1,3 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh

 murmurd -ini /etc/murmur.ini -supw $ADMIN_PASSWORD
--- a/rootfs/etc/s6-overlay/s6-rc.d/admin-pw/dependencies
+++ b/rootfs/etc/s6-overlay/s6-rc.d/admin-pw/dependencies
@ -0,0 +1 @@
+confd
--- a/rootfs/etc/s6-overlay/s6-rc.d/admin-pw/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/admin-pw/type
@ -0,0 +1 @@
+oneshot
--- a/rootfs/etc/s6-overlay/s6-rc.d/admin-pw/up
+++ b/rootfs/etc/s6-overlay/s6-rc.d/admin-pw/up
@ -0,0 +1 @@
+admin-pw
--- a/rootfs/etc/s6-overlay/s6-rc.d/murmur/dependencies
+++ b/rootfs/etc/s6-overlay/s6-rc.d/murmur/dependencies
@ -0,0 +1,2 @@
+confd
+admin-pw
--- a/rootfs/etc/s6-overlay/s6-rc.d/murmur/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/murmur/run
@ -1,3 +1,3 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh

 exec murmurd -fg -ini /etc/murmur.ini
--- a/rootfs/etc/s6-overlay/s6-rc.d/murmur/type
+++ b/rootfs/etc/s6-overlay/s6-rc.d/murmur/type
@ -0,0 +1 @@
+longrun
--- a/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/murmur
+++ b/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/murmur