GNU bug report logs - #75888
[PATCH] gnu: snapper: Fix dbus service paths

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 27 Jan 2025 08:25:41 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Jan 27 03:25:41 2025
Received: from localhost ([127.0.0.1]:59213 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tcKR9-0004TI-Mj
	for submit <at> 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 <ashish.is@HIDDEN>)
 id 1tcKR4-0004Sx-Cr
 for submit <at> 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 <ashish.is@HIDDEN>)
 id 1tcKQw-0003Er-TV
 for guix-patches@HIDDEN; 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 <ashish.is@HIDDEN>)
 id 1tcKQr-0004do-3W
 for guix-patches@HIDDEN; 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 <ashish.is@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: snapper: Fix dbus service paths
Date: Mon, 27 Jan 2025 09:23:30 +0100
Message-ID: <dc00e9fc4020ab58e0e1cbac6a2a4716637eee5a.1737966209.git.ashish.is@HIDDEN>
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@HIDDEN;
 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@HIDDEN, Ashish SHUKLA <ashish.is@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* gnu/packages/file-systems.scm (snapper):
[#:phases]<relative-file-locations>: 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 <a.r.draidi@HIDDEN>
 ;;; Copyright © 2024 Zheng Junjie <873216071@HIDDEN>
 ;;; Copyright © 2025 Julian Flake <flake@HIDDEN>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is@HIDDEN>
 ;;
 ;;; 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