Merge pull request #8 from tobbenb/master

Change config to old path.
Changed config path to tobbenb/tvheadend style.
2016-08-17 11:47:38 +01:00 · 2016-08-17 10:04:39 +02:00 · 2016-08-17 09:03:36 +02:00
2 changed files with 5 additions and 6 deletions
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -2,16 +2,15 @@

 # make folders
 mkdir -p \
-	/config/.hts/tvheadend/dvr/config \
+	/config/dvr/config \
 	/config/comskip

 # copy config
-[[ ! -e /config/.hts/tvheadend/dvr/config/7a5edfbe189851e5b1d1df19c93962f0 ]] && \
-	cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/.hts/tvheadend/dvr/config/7a5edfbe189851e5b1d1df19c93962f0
+[[ ! -e /config/dvr/config/ ]] && \
+	cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/dvr/config/7a5edfbe189851e5b1d1df19c93962f0
 [[ ! -e /config/comskip/comskip.ini ]]
 	cp /defaults/comskip.ini.org /config/comskip/comskip.ini

 # permissions
 chown -R abc:abc \
-	/config \
-	/config/.hts
+	/config
--- a/root/etc/services.d/tvheadend/run
+++ b/root/etc/services.d/tvheadend/run
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash
 exec \
-	s6-setuidgid abc /usr/bin/tvheadend -C
+	s6-setuidgid abc /usr/bin/tvheadend -C -c /config