From patchwork Fri Mar 11 12:57:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Weismueller X-Patchwork-Id: 5336 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 4KFQtr4SGlz3xj2 for ; Fri, 11 Mar 2022 12:57:08 +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 4KFQtq0fN9z2MC; Fri, 11 Mar 2022 12:57:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KFQtp68j5z2ySQ; Fri, 11 Mar 2022 12:57:06 +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 4KFQtm5jcJz2xLb for ; Fri, 11 Mar 2022 12:57:04 +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 4KFQtm1JXDzL7; Fri, 11 Mar 2022 12:57:04 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1647003424; 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=7iuaO+/1ksRjonfTEH76cA3ZUjCogMKNRvSjNdNEM8o=; b=s5aqR8gp0TX4yK9gtsv5R8IbfID7cFGTh7zYcB/MhVgeEDOcHEZoatzS1UrF8CjWs+7232 kr+wHeBEZe0DgKAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1647003424; 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=7iuaO+/1ksRjonfTEH76cA3ZUjCogMKNRvSjNdNEM8o=; b=U34lqrBXDiUR7yeoKrrYIU6A033GJk066Ctfy5U+CavDnyKMy92ikwyo7BxDDAz2c8weQs tE0aldVQ2szYv40OisauTCJZNGNegofRhhEIHg8YLwFaNWEhxPazia0DiLyzMX+rPa4BAR IcUXXlGqX4l7HV6oCNP3gT+IivUPfW1HwWsGFeBUsQDU9AX/LYZBySkRuyCkcHcDs8OInt IYdZEKOYg+o+mX972VcsFVfpnu9Zimu2/u0E8UasjHQR/ehqbL+/h5er8NuMYGJYgTy7vH vkdgPs1qbLP7uVqH07EXffG31NbVarw2pOzQs+6xkmtihHpHpRLbNETmqmPDiw== From: Daniel Weismueller To: development@lists.ipfire.org Subject: [PATCH] Add backup/include for cups Date: Fri, 11 Mar 2022 13:57:01 +0100 Message-Id: <20220311125701.7468-1-daniel.weismueller@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" To solve the behavior discribed in bug 12404 I added the path /var/ipfire/cups to the backup. Signed-off-by: Daniel Weismueller Reviewed-by: Adolf Belka --- config/backup/includes/cups | 1 + config/rootfiles/packages/cups | 1 + lfs/cups | 3 +++ 3 files changed, 5 insertions(+) create mode 100644 config/backup/includes/cups diff --git a/config/backup/includes/cups b/config/backup/includes/cups new file mode 100644 index 000000000..445413c2f --- /dev/null +++ b/config/backup/includes/cups @@ -0,0 +1 @@ +/var/ipfire/cups diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index f9d15bc8b..1143df6d5 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -837,6 +837,7 @@ usr/share/locale/zh_CN/cups_zh_CN.po #usr/share/man/man8/lpmove.8 var/cache/cups var/cache/cups/rss +var/ipfire/backup/addons/includes/cups #var/ipfire/cups var/ipfire/cups/cups-files.conf var/ipfire/cups/cups-files.conf.default diff --git a/lfs/cups b/lfs/cups index 99c9c8887..5c5aef5f8 100644 --- a/lfs/cups +++ b/lfs/cups @@ -94,6 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ln -v -sf /usr/bin/smbspool /usr/lib/cups/backend/smb + install -v -m 644 $(DIR_SRC)/config/backup/includes/cups \ + /var/ipfire/backup/addons/includes/cups + # install initscript $(call INSTALL_INITSCRIPT,cups) cp -fv $(DIR_SRC)/config/cups/cupsd.conf /var/ipfire/cups/