From patchwork Sat Mar 15 14:18:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Sergio_Pastor_P=C3=A9rez?= X-Patchwork-Id: 40204 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD16B27BBEA; Sat, 15 Mar 2025 14:20:37 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2EC6D27BBE2 for ; Sat, 15 Mar 2025 14:20:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ttSMw-0003UR-6o; Sat, 15 Mar 2025 10:20:06 -0400 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 1ttSMu-0003S9-Bd for guix-patches@gnu.org; Sat, 15 Mar 2025 10:20:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttSMu-00037l-14 for guix-patches@gnu.org; Sat, 15 Mar 2025 10:20:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=QerVVfNnoge7SeiT5yjjWQczv5448pHE+C6yiaamSKM=; b=P6uqUQToR/LWfXgeOegomeyLA6FZSzlfcDjglP8SsWE6TPctXjjAHHQg8ZJe7OHuUiOck91lwQiS5MkvxooUBTG15D2d7dHA00qxf2t1Mk5kr6Y9YyhrPd0RS6XD7p4RS26Bz4DoXbuDlnsS1RnkEMi834SH6fZp2A0iJ8DtJgj4FLX4Um13mspF8Vrw5vIxc89C8H/tELetb5CtuSiUsJ291+71i3n8xhMWokO34f5gG5aF9/MPJN/ncsjcmdlyr05Gy97uyHKjuiQVYSdfZa8x4LVSZYCVVyWXbTi/B9XOiuVRyFKTxMx+hquh73qaZ9c6fIHkdXZhWLOABXK4Ew==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ttSMt-0008WH-PC for guix-patches@gnu.org; Sat, 15 Mar 2025 10:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77037] [PATCH] services: `file-database-mcron-jobs' search updatedb in package field Resent-From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Mar 2025 14:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77037@debbugs.gnu.org Cc: Sergio Pastor =?utf-8?b?UMOpcmV6?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174204837132545 (code B ref -1); Sat, 15 Mar 2025 14:20:03 +0000 Received: (at submit) by debbugs.gnu.org; 15 Mar 2025 14:19:31 +0000 Received: from localhost ([127.0.0.1]:43024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ttSMM-0008Sq-Js for submit@debbugs.gnu.org; Sat, 15 Mar 2025 10:19:31 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59316) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ttSMJ-0008Rk-CX for submit@debbugs.gnu.org; Sat, 15 Mar 2025 10:19:28 -0400 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 1ttSM5-0003Mk-1L for guix-patches@gnu.org; Sat, 15 Mar 2025 10:19:17 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ttSM3-0002zp-Cb for guix-patches@gnu.org; Sat, 15 Mar 2025 10:19:12 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4394a0c65fcso6201845e9.1 for ; Sat, 15 Mar 2025 07:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742048348; x=1742653148; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=QerVVfNnoge7SeiT5yjjWQczv5448pHE+C6yiaamSKM=; b=h/mZ2CwKjLYWlOxLzkAqnxY3LiWb5e9MctHrnpKLtOEpJKrjk/fEBwWTRC+nqsyjy6 lZKvPiR3Mk4h+EWiVcVzpEQ0DDzfMDjQBd6BW/V7fWlUC7q1d0+5InSdbc52H2TJcenF livFhikx1AM2kZoT6QIDBbnWt97zRF2R7j/vIlCtZS2xagOJ47UlxvChHkxd1S/9hpSE dseDEJCLig7setK3++ibxw2Kr86nyDfdJh3TU8DzND7JMRQraBZ75JEr/lZWS3hqzO/4 +KyXEAS5gRP0avev9bJA90TSoonmABBJJ4fNT307upwUGLk3Iz09eylJnegu4iziBpw9 iZZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742048348; x=1742653148; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=QerVVfNnoge7SeiT5yjjWQczv5448pHE+C6yiaamSKM=; b=U+HDImxXRApWl/GUNxpucCNAkykisLyq5D//Il7j+sMw4ebUZucpvT+cKXi7tD3kIR 41X3U1SuRuWqBTOrNoa0hawm7rV3+IqhoynFt/RxBeIxRpMy9NVHfAM6S6MjRV6Vb8j2 k0mXDUL7fGPS/Ai7Ndq1gpYV7dX8b9XZQ59iuIhIuBMC4v7IX6dnwJLAYPWwOxSMiFrw 8Xl7M23zMkRJToCsiO8TqPgnq2lnRyLWUWFOp3XHdo2A/vPBmI6c3j5apPnBhPQ15w9O 7+vKujWhqIjzsgtrAyvASgrkzkeLyYqqU/23SWNvmHEC0UT2exwusnfNDfclY9ZlXi78 7skA== X-Gm-Message-State: AOJu0Yze+cMENGeWwAvo7yJ/mz8aEkZ790esxnsir+JZQYWxrvwdCIwy LQW9TAd4O7GqpfDr1DBjeE9r1toMXCChnQaZd0H2+4Lg0ZyMomizYuvoqw== X-Gm-Gg: ASbGnctSRDQcrwtZa5vq3QO9u5Lg99btujka/LDoScIt98qEWfrdvz2cQwN8MzjnFOu 0o4HGIi6f6yHMymAqGkQMWAMvkDGslXqX4lNjB8jWzdhwjDn9AAKieb2QzpjBhYPRaSyZV4vbFb MxDIhv5FeCAsQXCi68831fPHspAbbPdwgj0JzLRlHdxLxfN3kpsMQpCDc7+LT5q2bftbnY+0TtJ 1NYcWbnRChyx55WmSgRmryjoBdjkqLH6KH0PsU0wVCuQS4JVeGzMNceDbDSwG64I0zhnP3UD+Vm lrHrBTS6qniODJwyOqwusojv1BW1ePWrylrjhtqt0q3UCygRzmc11OWQAQ== X-Google-Smtp-Source: AGHT+IFCe6q0jh+MqYGs440IADkTz0kqpDhJMHMqouIXsf7Ia28st2p3D66xpU4TxkwcFuUgb8GJrQ== X-Received: by 2002:a05:600c:1d2a:b0:43c:efed:732d with SMTP id 5b1f17b1804b1-43d1ec8dd4emr88394325e9.16.1742048347729; Sat, 15 Mar 2025 07:19:07 -0700 (PDT) Received: from localhost ([2a0c:5a85:d50e:8e00:c7d4:a3dc:7540:dcad]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d1fdda32fsm51436685e9.4.2025.03.15.07.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Mar 2025 07:19:07 -0700 (PDT) From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Date: Sat, 15 Mar 2025 15:18:30 +0100 Message-ID: X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=sergio.pastorperez@gmail.com; helo=mail-wm1-x331.google.com 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches `file-database-service-type' appends 'bin/updatedb' path to the `package' field provided by `file-database-configuration'. This prevents users from using alternate packages which also provide 'updatedb' but in a different location. For example, the `plocate' package installs 'updatedb' it in 'sbin/updatedb'. Use `find-files' to locate the binary within the user configured package. * gnu/services/admin.scm (file-database-mcron-jobs): locate 'updatedb' binary. Change-Id: Id35b26cbe41261a0ac3add53757d240b003aa26e --- gnu/services/admin.scm | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) base-commit: 412f411d4f8780e6b60b448caae17f01c09be0eb diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 2a11a4f4f10..19b0d64f2c2 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -37,13 +37,16 @@ (define-module (gnu services admin) #:use-module (gnu services shepherd) #:use-module (gnu system accounts) #:use-module ((gnu system shadow) #:select (account-service-type)) - #:use-module ((guix store) #:select (%store-prefix)) + #:use-module ((guix store) #:select (%store-prefix + open-connection)) #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix modules) #:use-module (guix packages) #:use-module (guix records) + #:use-module (guix build utils) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:export (log-rotation-configuration @@ -473,17 +476,21 @@ (define (file-database-mcron-jobs configuration) #~(begin ;; 'updatedb' is a shell script that expects various ;; commands in $PATH. - (setenv "PATH" - (string-append #$package "/bin:" - #$(canonical-package coreutils) - "/bin:" - #$(canonical-package sed) - "/bin")) - (execl #$(file-append package "/bin/updatedb") - "updatedb" - #$(string-append "--prunepaths=" - (string-join - excluded-directories))))))) + (let ((updatedb-bin #$(find (cut executable-file? <>) + (find-files (package-output (open-connection) + package) + "^updatedb$")))) + (setenv "PATH" + (string-append (dirname updatedb-bin) ":" + #$(canonical-package coreutils) + "/bin:" + #$(canonical-package sed) + "/bin")) + (execl updatedb-bin + "updatedb" + #$(string-append "--prunepaths=" + (string-join + excluded-directories)))))))) (list #~(job #$schedule #$updatedb))))) (define file-database-service-type