Merge pull request #1152 from pi-hole/oneshot-timeouts

Run `_gravityonboot` oneshot in background
2022-07-21 19:52:04 +01:00 · 2022-07-21 19:52:04 +01:00 · 08837c5dcb
parent 1970ffd97d 6830b99e4a
commit 08837c5dcb
9 changed files with 3 additions and 2 deletions
--- 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/1-gravityonboot/up
@ -1 +0,0 @@
-bash /gravityonboot.sh
--- 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/1-gravityonboot/dependencies
--- 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/1-gravityonboot/type
--- 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
@ -0,0 +1,2 @@
+#!/command/execlineb
+background { bash -e /gravityonboot.sh }
--- 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/1-startup/type
--- 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/1-startup/up
--- 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
+_startup
--- 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/1-gravityonboot
--- 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/1-startup