diff --git a/root/docker-mods b/root/docker-mods index c6e9c9b..77c2d08 100755 --- a/root/docker-mods +++ b/root/docker-mods @@ -56,7 +56,7 @@ process_custom_services() { cp "${SERVICE}" /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run chmod +x /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run echo "longrun" > /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/type - touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-mods + touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-services touch /etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/custom-svc-"${NAME}" echo "[custom-init] ${NAME}: copied" elif [ ! -f "${SERVICE}" ]; then @@ -77,7 +77,7 @@ process_custom_services() { cp "${SERVICE}" /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run chmod +x /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/run echo "longrun" > /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/type - touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-mods + touch /etc/s6-overlay/s6-rc.d/custom-svc-"${NAME}"/dependencies.d/init-services touch /etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/custom-svc-"${NAME}" echo "[custom-init] ${NAME}: copied" elif [ ! -f "${SERVICE}" ]; then diff --git a/root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/base rename to root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-mods-end diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-custom-files b/root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-custom-files rename to root/etc/s6-overlay/s6-rc.d/init-services/dependencies.d/init-custom-files diff --git a/root/etc/s6-overlay/s6-rc.d/init-services/type b/root/etc/s6-overlay/s6-rc.d/init-services/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-services/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-services/up b/root/etc/s6-overlay/s6-rc.d/init-services/up new file mode 100644 index 0000000..a7c3905 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-services/up @@ -0,0 +1 @@ +# This file doesn't do anything, it just signals that services can start diff --git a/root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/init-custom-files/dependencies.d/init-adduser rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-services