From unknown Mon Aug 18 14:20:54 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#75888 <75888@debbugs.gnu.org> To: bug#75888 <75888@debbugs.gnu.org> Subject: Status: [PATCH] gnu: snapper: Fix dbus service paths Reply-To: bug#75888 <75888@debbugs.gnu.org> Date: Mon, 18 Aug 2025 21:20:54 +0000 retitle 75888 [PATCH] gnu: snapper: Fix dbus service paths reassign 75888 guix-patches submitter 75888 Ashish SHUKLA severity 75888 normal tag 75888 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 27 03:25:41 2025 Received: (at submit) by debbugs.gnu.org; 27 Jan 2025 08:25:41 +0000 Received: from localhost ([127.0.0.1]:59213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcKR9-0004TI-Mj for submit@debbugs.gnu.org; Mon, 27 Jan 2025 03:25:40 -0500 Received: from lists.gnu.org ([2001:470:142::17]:51156) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcKR4-0004Sx-Cr for submit@debbugs.gnu.org; Mon, 27 Jan 2025 03:25:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tcKQw-0003Er-TV for guix-patches@gnu.org; Mon, 27 Jan 2025 03:25:26 -0500 Received: from anamika.lostca.se ([65.21.75.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tcKQr-0004do-3W for guix-patches@gnu.org; Mon, 27 Jan 2025 03:25:25 -0500 Received: from localhost.localdomain (unknown [IPv6:2a02:9140:3880:e100:90da:b448:d3ee:a20f]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 400DB32D6; Mon, 27 Jan 2025 08:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1737966305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PGNu6cJoTGbwoo5S+wQpFIwwSBEgvpPbghZRyqf8qVg=; b=bIW80yAuuUkescOMSh5SaiPCa/yUdF8qzsILlcLxdj4k6jOT2r9HT4AWFoUd1ysEj3p5WK xukK2AbvUheGsS3ufcgh8fIPWRPKxEt0972smT5TCpg+inQyE6lFn/QlBjJUgbjjV5XRxW 3ya/7kJFZfCrguT/6szKP1DAn+P27Zo= From: Ashish SHUKLA To: guix-patches@gnu.org Subject: [PATCH] gnu: snapper: Fix dbus service paths Date: Mon, 27 Jan 2025 09:23:30 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: zhengjunjie@iscas.ac.cn, Ashish SHUKLA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) * gnu/packages/file-systems.scm (snapper): [#:phases]: Add more PATH substitutions in files. Change-Id: I3e91d18b44f33bf389b46b5c02ba124e1929bfd6 --- Hi, This patch makes sure that snapper dbus, and backup scripts work as documented, something which I missed in the patch in #75668. Apologies, and thanks in advance for committing. gnu/packages/file-systems.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 5fd92d08fb..a7c4c37c16 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2024 Ahmad Draidi ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2025 Julian Flake +;;; Copyright © 2025 Ashish SHUKLA ;; ;;; This file is part of GNU Guix. ;;; @@ -1391,10 +1392,22 @@ (define-public snapper (("/usr/lib") (string-append out "/lib")) (("/etc/") - (string-append out "/etc/")))) - (substitute* "client/Makefile.am" - (("/usr/lib") - "@libdir@"))))))) + (string-append out "/etc/"))) + (substitute* (cons "data/org.opensuse.Snapper.service" + (find-files "scripts/" "\\.sh")) + (("/usr/bin/snapper") + (string-append out "/bin/snapper")) + (("/usr/sbin/snapperd") + (string-append out "/sbin/snapperd")) + (("/sbin/btrfs") + (which "btrfs"))) + (substitute* "scripts/snapper-hourly" + (("PATH=.*$") + (format #f "PATH=~a/sbin:~a/bin\n" + out out))) + (substitute* (find-files "." "Makefile.am") + (("/usr/lib") + "@libdir@")))))))) (home-page "https://snapper.io") (native-inputs (list glibc-locales autoconf automake libtool pkg-config)) base-commit: 77603927fba0edc2c4d9de122aa132b968a051e5 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 01 12:35:04 2025 Received: (at control) by debbugs.gnu.org; 1 Feb 2025 17:35:04 +0000 Received: from localhost ([127.0.0.1]:59846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teHOa-0002gh-AZ for submit@debbugs.gnu.org; Sat, 01 Feb 2025 12:35:04 -0500 Received: from fhigh-b5-smtp.messagingengine.com ([202.12.124.156]:53447) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1teHOY-0002g4-8w for control@debbugs.gnu.org; Sat, 01 Feb 2025 12:35:03 -0500 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.stl.internal (Postfix) with ESMTP id DAA89254007D for ; Sat, 1 Feb 2025 12:34:56 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sat, 01 Feb 2025 12:34:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:content-type:date:date:from:from:in-reply-to:message-id :reply-to:subject:subject:to:to; s=fm2; t=1738431296; x= 1738517696; bh=PDC6LKcR85X1/Jqd9CEhIyJ+U7HFzriTkTw95CPV0eY=; b=D omqsc8ljcPqmZud+u4jynUFftdrW1rgr3pHmFNEbUheK7KFB/hZpuDFwSVUowQVT SkgeSp+AlljpIk3MWpRm4ms7d7jrYSI3ZMe1nzJ1Vc7+IZMYluYZo1HvtSP/ojyU /TIZ33qp9TUxdzL5+UVi5ni4tWAnx2HbkE465sfomLa+Yw9r0WLSjSDK19WDMLr7 CHhiZ02znEC8vzOYktETEGSVe4zdb1HHo6HXk21AnxE6NtfKR61bzBwHCtqYSVAd zbuLK1AaDsdcAt3Ca81I5Sc7AiAnTXTFNL+1DzbT7S667PgcHqMtrE7eYD8ahiIT iv6OpSPWQvpini3rAaulg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:message-id:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1738431296; x=1738517696; bh=PDC6LKcR85X1/Jqd9CEhIyJ+U7HF zriTkTw95CPV0eY=; b=HxUizqDBwGGiSFRwDrFpkfHhR5j/4OgXeZlsVH/R5DW1 TDZHzjVgckq/RvsComMy/Vc7TzirRG7cbx7Q+zAkgsTaxZxA4JIDHq1AsS8JyNSw QSSJ0XK/D7w+huo54iZa4DbHbAM0epbMNW9pwEORG8GUelUg6TqJuHfaf9O0XDhz Fm8HMXFXNfFZVpyomCE2rDsRcWdbAWKd9BR6YQpinbbKFYK+RcYJo1nu1u5XyjfG PDWB6NXpo+c53Owro2eGBD87g6TnG2q0FSUTxgK7QwwKK/SctXtt37VEXkha99eu IP8+s8RpOtqEqLJXl5rUUo9T1AZzK1ukXc0EHOYSBQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdefhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhepfffkvf fhufestddtredttddttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhr ohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeetkeejhfefhfetieegkeehheevvd efgffggeevffdtvddufeehiefgteeiueehkeenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspg hrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheptghonhhtrhho lhesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 1 Feb 2025 12:34:55 -0500 (EST) Date: Sat, 01 Feb 2025 09:34:55 -0800 Message-Id: <87v7ttfu0w.fsf@retrospec.tv> To: control@debbugs.gnu.org From: Ian Eure Subject: control message for bug #75888 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) close 75888 quit From unknown Mon Aug 18 14:20:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 02 Mar 2025 12:24:26 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator