minidlna: Add backup capability - bug#12710

- Backup definition missing - created ro backup config file
- Update of rootfile
- Addition of backup definition install into lfs file
- Addition of restore and backup statements into install.sh and uninstall.sh pak scripts

Fixes: 12710
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/backup/includes/minidlna b/config/backup/includes/minidlna
new file mode 100644 (file)
index 0000000..e4e6932
--- /dev/null
+++ b/config/backup/includes/minidlna
@@ -0,0 +1 @@
+/etc/minidlna.conf

diff --git a/config/rootfiles/packages/minidlna b/config/rootfiles/packages/minidlna
index 42a83f8da5a0011a026118543f4de8b2aa67e54f..12d81de5edf58ecf36c940fba148c90d36f95aa1 100644 (file)
--- a/config/rootfiles/packages/minidlna
+++ b/config/rootfiles/packages/minidlna
@@ -1,5 +1,5 @@
-etc/rc.d/init.d/minidlna
 etc/minidlna.conf
+etc/rc.d/init.d/minidlna
 usr/sbin/minidlnad
 #usr/share/locale/da/LC_MESSAGES/minidlna.mo
 #usr/share/locale/de/LC_MESSAGES/minidlna.mo
@@ -14,3 +14,4 @@ usr/sbin/minidlnad
 #usr/share/locale/ru/LC_MESSAGES/minidlna.mo
 #usr/share/locale/sl/LC_MESSAGES/minidlna.mo
 #usr/share/locale/sv/LC_MESSAGES/minidlna.mo
+var/ipfire/backup/addons/includes/minidlna

diff --git a/lfs/minidlna b/lfs/minidlna
index 822251fcf4dc0b6140dc150ee4a4332dd0a9aa90..a0e09a0a3744b8ca6d9357d31485303d3a04e1b4 100644 (file)
--- a/lfs/minidlna
+++ b/lfs/minidlna
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = minidlna
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = ffmpeg flac libexif libid3tag libogg
 
@@ -89,6 +89,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        #install initscripts
        $(call INSTALL_INITSCRIPT,minidlna)
+       
+       #install backup definition
+       install -v -m 644 ${DIR_SRC}/config/backup/includes/minidlna \
+                       /var/ipfire/backup/addons/includes/minidlna
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/paks/minidlna/install.sh b/src/paks/minidlna/install.sh
index 5080157cd961abbee3b27e6558c4d8bc2165c607..397d3b1930f63af9b39aae2914ffe31f82797461 100644 (file)
--- a/src/paks/minidlna/install.sh
+++ b/src/paks/minidlna/install.sh
@@ -25,6 +25,7 @@
 extract_files
 [ -d /var/mp3 ] ||  ( mkdir /var/mp3 && chown nobody.nobody /var/mp3 )
 
+restore_backup ${NAME}
 start_service ${NAME}
 
 ln -svf ../init.d/minidlna /etc/rc.d/rc0.d/K00minidlna

diff --git a/src/paks/minidlna/uninstall.sh b/src/paks/minidlna/uninstall.sh
index bc59838434b1a6688180ae9572956f50ac2cf809..8c8f28e47b87093884c21ed02edf3305594b4a1c 100644 (file)
--- a/src/paks/minidlna/uninstall.sh
+++ b/src/paks/minidlna/uninstall.sh
@@ -23,5 +23,6 @@
 #
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
+make_backup ${NAME}
 remove_files
 rm -rf /etc/rc.d/rc*.d/*minidlna