Rebase to 3.17, migrate to s6v3

root/etc/s6-overlay/s6-rc.d/init-tvheadend-config/run

@@ -1,24 +1,29 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make folders
 mkdir -p \
 	/config/comskip
 
 # copy config
-[[ ! -e /config/dvr/config ]] && \
+if [[ ! -e /config/dvr/config ]]; then
 	(mkdir -p /config/dvr/config && cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/dvr/config/7a5edfbe189851e5b1d1df19c93962f0)
-[[ ! -e /config/comskip/comskip.ini ]] && \
+fi
+if [[ ! -e /config/comskip/comskip.ini ]]; then
 	cp /defaults/comskip.ini.org /config/comskip/comskip.ini
-[[ ! -e /config/config ]] && \
-        (cp /defaults/config /config/config)
+fi
+if [[ ! -e /config/config ]]; then
+    (cp /defaults/config /config/config)
+fi
 
 # extract picons on first run
-[[ -f /picons.tar.bz2 ]] && \
+if [[ -f /picons.tar.bz2 ]]; then
         mkdir -p /picons
 	tar xf \
 		/picons.tar.bz2 -C \
 		/picons &&
 	rm -f /picons.tar.bz2
+fi
 
 # function to randomly sample 5 files for their owner and only chown if not abc
 chowner () {

root/etc/s6-overlay/s6-rc.d/init-tvheadend-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-tvheadend-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-tvheadend-config/run

root/etc/s6-overlay/s6-rc.d/init-video-config/run

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 FILES=$(find /dev/dri /dev/dvb -type c -print 2>/dev/null)
 

root/etc/s6-overlay/s6-rc.d/init-video-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-video-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-video-config/run

root/etc/s6-overlay/s6-rc.d/svc-tvheadend/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-tvheadend/run

@@ -1,4 +1,6 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 9981" \
         s6-setuidgid abc /usr/bin/tvheadend -C -c /config $RUN_OPTS

root/etc/s6-overlay/s6-rc.d/svc-tvheadend/type

@@ -0,0 +1 @@
+longrun