From 80b126a2f400c433d1647955518dfc5d1bdb49df Mon Sep 17 00:00:00 2001
From: svenhoefer <svenhoefer@svenhoefer.com>
Date: Mon, 23 Nov 2020 23:58:02 +0100
Subject: [PATCH] - data/config: remove some hardcoded paths

 Conflicts:
	data/config/settingsupdate.conf.in

Signed-off-by: Thilo Graf <dbt@novatux.de>

Files adapted because of different configurations.
---
 configure.ac                                  |  6 +++++
 data/config/Makefile.am                       |  4 +++
 ...ingsupdate.conf => settingsupdate.conf.in} | 26 +++++++++++--------
 .../{tobackup.conf => tobackup.conf.in}       |  0
 4 files changed, 25 insertions(+), 11 deletions(-)
 rename data/config/{settingsupdate.conf => settingsupdate.conf.in} (78%)
 rename data/config/{tobackup.conf => tobackup.conf.in} (100%)

diff --git a/configure.ac b/configure.ac
index 97322654f..536e65ed1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -472,6 +472,12 @@ AC_CONFIG_FILES([
 src/nhttpd/nhttpd.conf
 ])
 
+# Backup configs
+AC_CONFIG_FILES([
+data/config/settingsupdate.conf
+data/config/tobackup.conf
+])
+
 # Themes
 #AC_CONFIG_FILES([
 #data/themes/Material_Blue-Grey.theme
diff --git a/data/config/Makefile.am b/data/config/Makefile.am
index 21f47ed77..9940acc82 100644
--- a/data/config/Makefile.am
+++ b/data/config/Makefile.am
@@ -1,3 +1,7 @@
+EXTRA_DIST = \
+	settingsupdate.conf settingsupdate.conf.in \
+	tobackup.conf tobackup.conf.in
+
 installdir = $(CONFIGDIR)
 
 install_DATA = \
diff --git a/data/config/settingsupdate.conf b/data/config/settingsupdate.conf.in
similarity index 78%
rename from data/config/settingsupdate.conf
rename to data/config/settingsupdate.conf.in
index 5234dc041..d2e6b2313 100644
--- a/data/config/settingsupdate.conf
+++ b/data/config/settingsupdate.conf.in
@@ -25,30 +25,34 @@
 ## vor der Sicherung aus dem neuen Image zu löschende Dateien/Verzeichnisse,
 ## gekennzeichnet durch ein vorangestelltes ~
 # z.B.
-# ~/share/tuxbox/neutrino/themes/Classic.theme
+# ~@THEMESDIR@/Classic.theme
 #---------------------------------------------------------------------------
 
 
 #-------------
 ## Sicherungen
 #-------------
+@CONFIGDIR@/
+
+/etc/exports
 /etc/hostname
 /etc/hosts
-/etc/network
+/etc/passwd
 /etc/resolv.conf
 /etc/wpa_supplicant.conf
-/var/etc
-/var/tuxbox/config
+
+
+## Persönliche Sicherungen
 
 
 #----------------------------------------------------------------------------------------
 ## von der Sicherung auszuschließende Dateien, gekennzeichnet durch ein vorangestelltes -
 #----------------------------------------------------------------------------------------
 -/var/etc/update.urls
--/var/tuxbox/config/cables.xml
--/var/tuxbox/config/encoding.conf
--/var/tuxbox/config/providermap.xml
--/var/tuxbox/config/radio-stations.xml
--/var/tuxbox/config/satellites.xml
--/var/tuxbox/config/settingsupdate.conf
--/var/tuxbox/config/tobackup.conf
+-@CONFIGDIR@/cables.xml
+-@CONFIGDIR@/encoding.conf
+-@CONFIGDIR@/providermap.xml
+-@CONFIGDIR@/radio-stations.xml
+-@CONFIGDIR@/satellites.xml
+-@CONFIGDIR@/settingsupdate.conf
+-@CONFIGDIR@/tobackup.conf
diff --git a/data/config/tobackup.conf b/data/config/tobackup.conf.in
similarity index 100%
rename from data/config/tobackup.conf
rename to data/config/tobackup.conf.in