X-Loop: help-debbugs@HIDDEN Subject: [bug#75888] [PATCH] gnu: snapper: Fix dbus service paths Resent-From: Ashish SHUKLA <ashish.is@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Mon, 27 Jan 2025 08:26:02 +0000 Resent-Message-ID: <handler.75888.B.173796634117197 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 75888 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75888 <at> debbugs.gnu.org Cc: zhengjunjie@HIDDEN, Ashish SHUKLA <ashish.is@HIDDEN> X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> debbugs.gnu.org id=B.173796634117197 (code B ref -1); Mon, 27 Jan 2025 08:26:02 +0000 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 <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> 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-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
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Ashish SHUKLA <ashish.is@HIDDEN> Subject: bug#75888: Acknowledgement ([PATCH] gnu: snapper: Fix dbus service paths) Message-ID: <handler.75888.B.173796634117197.ack <at> debbugs.gnu.org> References: <dc00e9fc4020ab58e0e1cbac6a2a4716637eee5a.1737966209.git.ashish.is@HIDDEN> X-Gnu-PR-Message: ack 75888 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75888 <at> debbugs.gnu.org Date: Mon, 27 Jan 2025 08:26:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 75888 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 75888: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75888 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
Received: (at control) by debbugs.gnu.org; 1 Feb 2025 17:35:04 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Feb 01 12:35:04 2025 Received: from localhost ([127.0.0.1]:59846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1teHOa-0002gh-AZ for submit <at> 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 <ian@HIDDEN>) id 1teHOY-0002g4-8w for control <at> 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 <control <at> debbugs.gnu.org>; 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: <xms:QFueZ1Pi42QbmmxoTNPbyU_20lOvjeKNp7QgZEpN-zfyGXsZbsiUZw> <xme:QFueZ38L2Jipkl3sDtgC6tKeQGcGCzYn97cPIsfqwx8oG1fR5x2mPcc93wJ146Aib yaAVVcoNB8tC-fH0Q> X-ME-Received: <xmr:QFueZ0RXxeA1a_Q0-KF6XV790Tk-OfbFrY-0aBazNyYTAiQBExQtbRU4Dc2Nr-toc0c69UL4aUvaND0OcDy1dSFRGZTHL6959PGpIgJ54A> X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduvdefhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdp uffrtefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecunecujfgurhepfffkvf fhufestddtredttddttdenucfhrhhomhepkfgrnhcugfhurhgvuceoihgrnhesrhgvthhr ohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeetkeejhfefhfetieegkeehheevvd efgffggeevffdtvddufeehiefgteeiueehkeenucevlhhushhtvghrufhiiigvpedtnecu rfgrrhgrmhepmhgrihhlfhhrohhmpehirghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspg hrtghpthhtohepuddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtoheptghonhhtrhho lhesuggvsggsuhhgshdrghhnuhdrohhrgh X-ME-Proxy: <xmx:QFueZxusALBgoCLfR6sg-AivhY4Lpl3A1WIxk_JybwpmB3IInxd6IQ> <xmx:QFueZ9dNEdoJr4Vhzqu6svPjkBmVRbfNuTMPWKx1MBT4tyO8gQk8Dw> <xmx:QFueZ93qZxpixB3NZrvQjx3wmFRbwHEbj2hMk4YzmTn_6k2Q9X1tQw> <xmx:QFueZ58fmzfiu-gfGbqwoLAZ5Zhy_HpNqDQ8doMEJR0wumK252l4tw> <xmx:QFueZ9H_ONvluqz6HXoJ98tdnBTLASTZF3ZdeQBX7nVCpi6ZrH7P_Uqh> Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <control <at> debbugs.gnu.org>; Sat, 1 Feb 2025 12:34:55 -0500 (EST) Date: Sat, 01 Feb 2025 09:34:55 -0800 Message-Id: <87v7ttfu0w.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: Ian Eure <ian@HIDDEN> Subject: control message for bug #75888 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control 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: -1.7 (-) close 75888 quit
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.