From patchwork Thu Mar 27 22:36:52 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: 40890 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 E5A1127BBEA; Thu, 27 Mar 2025 22:39:40 +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 84B5827BBE9 for ; Thu, 27 Mar 2025 22:39:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txvsQ-0003wX-JI; Thu, 27 Mar 2025 18:39: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 1txvsO-0003wP-Uf for guix-patches@gnu.org; Thu, 27 Mar 2025 18:39: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 1txvsN-0002H2-Ks; Thu, 27 Mar 2025 18:39:03 -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:In-Reply-To:References:Subject; bh=+LSw/32ZVk5gn+Rm9tfgT2dBmnyKkxLc7100RdXCzJ4=; b=ax0v+i7mOTkj9djMISg5eH3jKSJvgpk6+nu9z0s+azfGmc/tnNwbKnC1POozy2aR3SorsOI2w39QDTilheylAz4labSBz9gWul5kqRg5NdyIBU+5qhthH8VipwVYRBHgybqF/n/mhJBYEIWNSQC+1HAgGsjaEqu3LqgFsnaJNPgtv/6tYXR1eyapsAZa8ihP8ytcmm6R5bTw5Qvh/OIzlFSgkSounUHjiWTZbTriWtbWIww4MvFltr+Vo0ZkIzSMHCKkXH1RZk43X5TnxsJU6kP9MoN1nbUFsxVE10xHKLA3JBwj4WD5d6VqRFWtTCylz8MVcic0I3Wq//WHX/wV+Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txvsM-0004aT-BV; Thu, 27 Mar 2025 18:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77037] [PATCH v2] services: `file-database-mcron-jobs' search updatedb in package field References: In-Reply-To: Resent-From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Original-Sender: "Debbugs-submit" Resent-CC: sergio.pastorperez@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 27 Mar 2025 22:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77037@debbugs.gnu.org Cc: Sergio Pastor =?utf-8?b?UMOpcmV6?= , Sergio Pastor =?utf-8?b?UMOpcmV6?= , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Sergio Pastor =?utf-8?b?UMOpcmV6?= , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 77037-submit@debbugs.gnu.org id=B77037.174311509417558 (code B ref 77037); Thu, 27 Mar 2025 22:39:02 +0000 Received: (at 77037) by debbugs.gnu.org; 27 Mar 2025 22:38:14 +0000 Received: from localhost ([127.0.0.1]:51776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txvrZ-0004Z6-OC for submit@debbugs.gnu.org; Thu, 27 Mar 2025 18:38:14 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:48303) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1txvrU-0004Yg-6b for 77037@debbugs.gnu.org; Thu, 27 Mar 2025 18:38:09 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so10420435e9.0 for <77037@debbugs.gnu.org>; Thu, 27 Mar 2025 15:38:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1743115081; x=1743719881; darn=debbugs.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=+LSw/32ZVk5gn+Rm9tfgT2dBmnyKkxLc7100RdXCzJ4=; b=WGntHM1vyg5htrqTv3ytbRRNzL/Yx+eecJH8Fsd0+8rJMbul+DJo/L9PGN4R2+xSmI +0QHQC0yPLV6L/kHpzksndjOgEXP14mM4HK6OIDXL8BOF7CP3cOiR9PAcVo37TGzExN1 tZoAcBZp03UPXx87kU2wlfUSjTgQV4oCWLbvhuS2hpSm7yP26jZZ1P9bQdPNr0pj5Xp9 EoQbfhE9Oprfs8svAuQj5q21Kv9AlnWVjFEH1bLUn/Y5annMgk/eTutGROiNVC2ajwbH uz/ThYGCaNU3Zz6/KYgqyLqRRVJvXVkreKg9gdCSlF07umv2q/Om03jCqBhnR93O3NKB yhjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743115081; x=1743719881; 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=+LSw/32ZVk5gn+Rm9tfgT2dBmnyKkxLc7100RdXCzJ4=; b=ntEIP6io03tVFOpiyBvn6vwApUj28fgDSV5c4hFcCDtUMjAvvEMGFKThdCksZFtV6L CSftSssgpT6ND96hZJN3xXHBMD0S6XL0FpimKz7iijR8CNf+4mVMMvuF63lx7L9/1rfl GpX/dBhj3WE3LD3p0eSJxHN8lRQOyx9iyIyPBa4PC8xiybbHVKuAZ+kl/C61HDgnkUdg uKeg4Gzw5MalQSKeKlLl4g8Xmjp0uNxQdl8a61TqEygZc/3QapyRbKSznFJuh3CuMqUF mA120cK1HjKalXO7Tbhbe3QZxT/UW2rAd459APwOYvF2p2lC3k/dgarc7ahOeCNTxMju SiQQ== X-Gm-Message-State: AOJu0YyXNhYz6+6vduugLvJlG1Sg1sZkddCWoxKc/P/SCruSiOLUAlEp +tNriLqcIXDnd2f1EDARYlcZxumjsiHFqY3PzxuQJP/3DhSCT2DKPd4YehFKtkk= X-Gm-Gg: ASbGnctmpNArSJzM1zygH1QM8Nz0xdAvya3j2imewE/lc+npf6qu/2DVyF0F65skZL0 58xzRFNDSHxJdH4rhgpnRBrcYQ0bYO9eUuEBYsMwEwI9+Dywbr0H3xXuLkrTv7pzjzf1NBkylF4 EKijCnzqCAY1XEy/U2JLouWzwqD2qDWapypf3CMdCr1CWC/AIflttGbfCouy8/57ukbu/kSCmix 8xXJmgTjS7XKIqoBZ+WqZS7FPY93ipaF3ziJKb9X45kk6rdAOy5tZrSO1MUUVpkjlPbd2ayQAUx r1iwrsdPbsxMdmBbLGG+G3S+zVpeJWlRMGggTF5Nmyi1ZWSO8EqRgZFgf2mdaVRQDLM= X-Google-Smtp-Source: AGHT+IFAfkNgY8jBljK/a9vn0dsulhJXhSjIHnvqlTx2ByQoj6hdo3bDQ58PEF2l3gYWAlsbchg89w== X-Received: by 2002:a05:600c:1d9e:b0:43d:609:b305 with SMTP id 5b1f17b1804b1-43d84fb435amr56022115e9.17.1743115080903; Thu, 27 Mar 2025 15:38:00 -0700 (PDT) Received: from localhost ([2a0c:5a85:d101:ec00:238d:e28e:299:3131]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d8314b3e2sm52127585e9.33.2025.03.27.15.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Mar 2025 15:38:00 -0700 (PDT) From: Sergio Pastor =?utf-8?b?UMOpcmV6?= Date: Thu, 27 Mar 2025 23:36:52 +0100 Message-ID: <2cbc00c8029bcaed82b5dfbc49053e28a966d3c9.1743115012.git.sergio.pastorperez@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 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' in 'sbin/updatedb'. Fallback to 'sbin/' if 'updatedb' is not found in 'bin/'. * gnu/services/admin.scm (file-database-mcron-jobs): locate 'updatedb' binary. Change-Id: Ic741716044be3a8f51a157510f9f923bd66c41d7 --- gnu/services/admin.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) base-commit: 71ae6f2a191e715c96b02e876f5e40e4932debd8 diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index e4737940438..0eb38555951 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -448,8 +448,8 @@ (define-configuration/no-serialization file-database-configuration (if target findutils (canonical-package findutils)))) - "The GNU@tie{}Findutils package from which the @command{updatedb} command -is taken.") + "The package from which the @command{updatedb} command is taken. +Examples of such packages are GNU@tie{}Findutils and Plocate.") (schedule (string-or-gexp %default-file-database-update-schedule) "String or G-exp denoting an mcron schedule for the periodic @@ -468,15 +468,20 @@ (define (file-database-shepherd-services configuration) (let ((updatedb (program-file "updatedb" #~(begin + (define updatedb + (let ((try (lambda (file) + (and (file-exists? file) file)))) + (or (try #$(file-append package "/bin/updatedb")) + (try #$(file-append package "/sbin/updatedb"))))) ;; 'updatedb' is a shell script that expects various ;; commands in $PATH. (setenv "PATH" - (string-append #$package "/bin:" + (string-append (dirname updatedb) ":" #$(canonical-package coreutils) "/bin:" #$(canonical-package sed) "/bin")) - (execl #$(file-append package "/bin/updatedb") + (execl updatedb "updatedb" #$(string-append "--prunepaths=" (string-join