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 · 2016-08-16 17:42:27 +01:00 · 2016-08-16 17:37:23 +01:00 · 2016-08-16 17:31:35 +01: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 ]] && \
+[[ ! -e /config/dvr/config/ ]] && \
-	cp /defaults/7a5edfbe189851e5b1d1df19c93962f0 /config/.hts/tvheadend/dvr/config/7a5edfbe189851e5b1d1df19c93962f0
+	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
 	/config/.hts
--- 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
Author	SHA1	Message	Date
sparklyballs	252113dc1b	Merge pull request #8 from tobbenb/master Change config to old path.	2016-08-17 11:47:38 +01:00
tobbenb	3f8e723f7d	Changed config path to tobbenb/tvheadend style. Changed config path to tobbenb/tvheadend. Changed dvr default config check from file to directory.	2016-08-17 10:04:39 +02:00
tobbenb	745ea0acf9	Change config to old path. Changed config to tobbenb/tvheadend path. This way there should be no problem moving to the linuxserver version. Should have done this from the start!	2016-08-17 09:03:36 +02:00
sparklyballs	75e7fccee8	Merge pull request #6 from linuxserver/revert-5-revert-4-iconv Revert "Revert "test iconv as possible fix for file types""	2016-08-16 17:42:27 +01:00
sparklyballs	04d2505e81	Revert "Revert "test iconv as possible fix for file types""	2016-08-16 17:37:23 +01:00
sparklyballs	54d63a5e00	Merge pull request #5 from linuxserver/revert-4-iconv Revert "test iconv as possible fix for file types"	2016-08-16 17:31:35 +01:00
sparklyballs	a14f66db00	Revert "test iconv as possible fix for file types"	2016-08-16 17:30:38 +01:00