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

Previous Next

Full log

View this message in rfc822 format

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: 75888 <at> debbugs.gnu.org
Cc: zhengjunjie <at> iscas.ac.cn, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [bug#75888] [PATCH] gnu: snapper: Fix dbus service paths
Date: Mon, 27 Jan 2025 09:23:30 +0100

* 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 <at> redscript.org>
 ;;; Copyright © 2024 Zheng Junjie <873216071 <at> qq.com>
 ;;; Copyright © 2025 Julian Flake <flake <at> uni-koblenz.de>
+;;; Copyright © 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
 ;;
 ;;; 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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.