From b9df80b1ee9ade852982e596d3825938b3f59cdd Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Thu, 21 Jul 2022 19:45:30 +0100 Subject: [PATCH 1/2] Change of naming convention for oneshots --- .../s6-rc.d/{1-gravityonboot => _gravityonboot}/dependencies | 0 .../s6-overlay/s6-rc.d/{1-gravityonboot => _gravityonboot}/type | 0 .../s6-overlay/s6-rc.d/{1-gravityonboot => _gravityonboot}/up | 0 .../etc/s6-overlay/s6-rc.d/{1-startup => _startup}/type | 0 .../etc/s6-overlay/s6-rc.d/{1-startup => _startup}/up | 0 .../debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/dependencies | 2 +- .../s6-rc.d/user/contents.d/{1-gravityonboot => _gravityonboot} | 0 .../s6-overlay/s6-rc.d/user/contents.d/{1-startup => _startup} | 0 8 files changed, 1 insertion(+), 1 deletion(-) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{1-gravityonboot => _gravityonboot}/dependencies (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{1-gravityonboot => _gravityonboot}/type (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{1-gravityonboot => _gravityonboot}/up (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{1-startup => _startup}/type (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/{1-startup => _startup}/up (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/{1-gravityonboot => _gravityonboot} (100%) rename src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/{1-startup => _startup} (100%) diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-gravityonboot/dependencies b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-gravityonboot/dependencies rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/dependencies diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-gravityonboot/type b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/type similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-gravityonboot/type rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/type diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-gravityonboot/up b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-gravityonboot/up rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-startup/type b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/type similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-startup/type rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/type diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-startup/up b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/up similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/1-startup/up rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/_startup/up diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/dependencies b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/dependencies index c81115b..2ebccf7 100644 --- a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/dependencies +++ b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/pihole-FTL/dependencies @@ -1 +1 @@ -1-startup \ No newline at end of file +_startup \ No newline at end of file diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/1-gravityonboot b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_gravityonboot similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/1-gravityonboot rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_gravityonboot diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/1-startup b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_startup similarity index 100% rename from src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/1-startup rename to src/s6/debian-root/etc/s6-overlay/s6-rc.d/user/contents.d/_startup From 6830b99e4a80f85323d32f066ce544d870332869 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Thu, 21 Jul 2022 19:46:02 +0100 Subject: [PATCH 2/2] Start gravityonboot.sh as a background task to prevent timeouts --- src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up index 1a88195..c292158 100755 --- a/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up +++ b/src/s6/debian-root/etc/s6-overlay/s6-rc.d/_gravityonboot/up @@ -1 +1,2 @@ -bash /gravityonboot.sh \ No newline at end of file +#!/command/execlineb +background { bash -e /gravityonboot.sh } \ No newline at end of file