From patchwork Fri Oct 22 13:37:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4808 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HbQQ74XG3z3wd1 for ; Fri, 22 Oct 2021 13:37:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HbQQ63bBvzj1; Fri, 22 Oct 2021 13:37:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HbQQ61q7gz2ylM; Fri, 22 Oct 2021 13:37:34 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HbQQ42v88z2xK9 for ; Fri, 22 Oct 2021 13:37:32 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4HbQQ33J46zj1; Fri, 22 Oct 2021 13:37:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1634909851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FbvSmDzbh6z9Q5HIx7vmK6mBwdaF5qQmd+T7fJwc/oU=; b=zb5pMWvoyvrfbB9qAp6PKfThglYL1MqIishfAwe5vJQEXYjUP6p9ORU/jRbNQ4aqphLveL OInhwbwhWgc0O0AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1634909851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=FbvSmDzbh6z9Q5HIx7vmK6mBwdaF5qQmd+T7fJwc/oU=; b=wcj77QJMBocPpXbPiwtGDJsq/j+m0hcgxkXM9N4IhUhil4vwKeqIsTmtnPwQ3j48LLYhWe xXy8s/JBLVCl6+nUGZIoJ/TrxyBEbMDRefHLTrH4idi3qUgccHi1/IKchqE3YSbgtdeByA 7akom9qLL4QbRvin/7ksnbqMZqwQatKJX2P/fkTHUYTL0lNq+JyMl+Mhsd/DZCjzSf5wcV EwbclilkEGu6FFmgV7l4WsgYoNsTnJlr2dTn08cLpbbR3LKe1QDoHoiJJd6hlidza8pWiz sL0PQW1icWKR2CPmRqiyJ7GyTpau2cLkwOl5sI0WxlZZ70rmhoD9UwgbARNBCA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] minidlna: Add backup capability - bug#12710 Date: Fri, 22 Oct 2021 15:37:27 +0200 Message-Id: <20211022133727.2711169-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 --- config/backup/includes/minidlna | 1 + config/rootfiles/packages/minidlna | 3 ++- lfs/minidlna | 6 +++++- src/paks/minidlna/install.sh | 1 + src/paks/minidlna/uninstall.sh | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 config/backup/includes/minidlna diff --git a/config/backup/includes/minidlna b/config/backup/includes/minidlna new file mode 100644 index 000000000..e4e69325c --- /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 42a83f8da..12d81de5e 100644 --- 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 822251fcf..a0e09a0a3 100644 --- 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 5080157cd..397d3b193 100644 --- 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 bc5983843..8c8f28e47 100644 --- 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