From patchwork Thu May 8 06:02:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42398 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 4BC2F27BC4B; Thu, 8 May 2025 07:37:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,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 B2DA427BC49 for ; Thu, 8 May 2025 07:37:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCusf-0006b0-GH; Thu, 08 May 2025 02:37:22 -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 1uCusS-0006Z0-HF for guix-patches@gnu.org; Thu, 08 May 2025 02:37: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 1uCusR-0001iQ-Fd; Thu, 08 May 2025 02:37: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:References:In-Reply-To:Date:From:To:Subject; bh=QBCOY8S/64W086HeEkt/imKkTN3Sf3gXU+nRf8YyGOg=; b=PD9Srw4i0FgGFMTA0VNNVzNLfubw1jJjJit8PV25OtmqmOKlZMhuvMmjmm5wHnsAgllHdw462l8c6JrEGlW5Nn4v10rU87uZEJgXWb0+A590G1skLCfZheWyhfdHlC8uGjqvUQjZniW7VIBZ90W0HXd4z34NLhaeg40H+VGDl8cwb0mmGVeI5UArgYF2xgj+aWIdVNIxCqdd2vE8oS88A87agpfEIOb0/z69z+zGUfvdsjZIv5fjH9Dg8eM/Z4UQLfNh+gQbDhElVP5GgEtD2gBFqT4A0dqH84VbZNrrqswyuQ3UG7IJZ27+3qAjyDGwBuKCIlxR3W/Z9ERLD1phKQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uCusR-0000ls-7e; Thu, 08 May 2025 02:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78308] [PATCH 5/9] services: Add etc-bashrc-d-service-type. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 08 May 2025 06:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78308 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78308@debbugs.gnu.org Cc: Maxim Cournoyer , Gabriel Wicki , Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Gabriel Wicki , Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 78308-submit@debbugs.gnu.org id=B78308.17466861732766 (code B ref 78308); Thu, 08 May 2025 06:37:03 +0000 Received: (at 78308) by debbugs.gnu.org; 8 May 2025 06:36:13 +0000 Received: from localhost ([127.0.0.1]:52873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCurb-0000iI-QC for submit@debbugs.gnu.org; Thu, 08 May 2025 02:36:13 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:47270) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uCurZ-0000hS-09 for 78308@debbugs.gnu.org; Thu, 08 May 2025 02:36:09 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-739be717eddso563566b3a.2 for <78308@debbugs.gnu.org>; Wed, 07 May 2025 23:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746686162; x=1747290962; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QBCOY8S/64W086HeEkt/imKkTN3Sf3gXU+nRf8YyGOg=; b=K3NJLhUAEErsFzof4XL3DXm+mLr5TAmGdx+bk66UKQt9RVYInaRLxjWq6AqA8n15hj N8iMomfemLw75y9BfrmETkoI7NIkJMmUCS3O5/o6JK34p5KfB2zmxQRPMQi6KBKbx43H aKB0/QlLr5JbUu7wUizfS6wYmDNiUu1mkw3dZwvuc+OjSlqnrpy8yAOJXOT+0wkMFL7D vyJbpImaRJcZ5p27b1dxj2iskNmI0TSKgrgR/6Y22AuhDgHnR+awOOwT1cIMT7/bOS7A 21G9T8eqvOieNMRrvTqE3aLKjdZD3k94hQpheSQt9ITo81gJLiz84NY2bcwWOxpB8vTu oy+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746686162; x=1747290962; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QBCOY8S/64W086HeEkt/imKkTN3Sf3gXU+nRf8YyGOg=; b=oGLY0/zczJI+KHBpanK0Zk8EHF3j08sWVUGz4CcKR2tfPdlwCigW7Lc6+TmXEVXybA tNq1ivs1GA87BP/GHrCVMZcOUfbCG+4CCCwTgiGXWtzClNs9q1GnFpSu2ZmFTTRzWGNU bS+ZNbdwM2XxaTUhZ7T/k/j4teB386l37NHfVkxZvUM45L/yiznDyueWfUrcDe6Qw4oa 0h4EU7wLcGtIhDPHGgGi/P9Hhzns/ZpOEi145L2kNV+qTPD4TDdW9XyTzaEdVPpKkng6 LCwUCFfuGfeQmsU+gTFBqgTm0ASfdugHdFRyx5gTtrJcFhr2ZYOqVN5lXb9NmBQ8UPBA LliA== X-Gm-Message-State: AOJu0YyCqUkDVEAWXX/eZvV5kWuQd6H9wponPAAKz+jG73MkagHhnz65 lU+hD2A3SSlkivOQ7FKpBJgkaKGoYWOvKKQtKfQ0gCHb286L3D2Keb7JZw== X-Gm-Gg: ASbGnctW56nJatFHrBJBJ0NTSKJStJ7KvZf9kBqu8MOvplNg9FOn8Yl5+HhXn9rdQ9L kmuGJCrUOjYkQdc9Sy+hkrGfCypg8UT8ZW9RUsg8+klVDNdYXjt4XrRGasL0mdL3bBwWXeb3wH1 ZBt5ZmRGH7DPVdVwnyx/2jJTmx6pRbMcLdQ/GMzNM4amQzFv5a1HxNkb7tkR/ecD5YooKuNJ/92 ZTUfz8nbmdXRVreBl14pnRobnebmaiuTogxAeohRgaRZuPs4jAtXg84deS2eQBffafb5i7O7z39 8++4FgrJkecVVYfAYU1j9jLEKhHh4MPNrTPeQxGIWr8d2leG+UE/342g8u/y X-Google-Smtp-Source: AGHT+IH7BLLtzgZ9JhzSHnghdyrfzABzPWklAZwpZtaUlO5KLPpTQmpCmL4L+AuAHW51QUg2qiUx7w== X-Received: by 2002:a05:6a21:4581:b0:1f5:7ea8:a791 with SMTP id adf61e73a8af0-2148ba2577fmr8913211637.10.1746686162360; Wed, 07 May 2025 23:36:02 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74058dc45c7sm12452121b3a.71.2025.05.07.23.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 23:36:01 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 8 May 2025 15:02:21 +0900 Message-ID: <55fa089568d524e9aaba9416fdddd441b2b06919.1746682206.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: 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 * gnu/services.scm (files->bashrc-d-directory) New procedure. (etc-bashrc-d-service-type): New service type. * doc/guix.texi (Service Reference): Document it. * gnu/tests/base.scm (test-basic-os): Test it. Change-Id: Ibbb0f684de7aee296adedbce5b1192786d661af2 --- doc/guix.texi | 16 ++++++++++++++++ gnu/services.scm | 14 ++++++++++++++ gnu/tests/base.scm | 39 ++++++++++++++++++++++++++++++--------- 3 files changed, 60 insertions(+), 9 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 05124e8ce6f..74503ce0e6c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -47536,6 +47536,22 @@ Service Reference @end example @end defvar +@defvar etc-bashrc-d-service-type +The type of the @file{/etc/bashrc.d} service. This service is used to +create files under @file{/etc/bashrc.d}. It takes as value a list of +file-like objects, as can be produced with @code{local-file}, +@code{plain-file}, etc. Package objects can also be provided directly +to have their @file{etc/bashrc.d/*.sh} prefixed files added. An example +usage may look like: + +@example +(use-package-modules gnome) ;for the `vte' package + +(service etc-bashrc-d-service-type + (list (file-append vte "/etc/profile.d/vte.sh"))) +@end example +@end defvar + @defvar privileged-program-service-type Type for the ``privileged-program service''. This service collects lists of executable file names, passed as gexps, and adds them to the set of diff --git a/gnu/services.scm b/gnu/services.scm index 8584b16ac5c..7083c88c130 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -123,6 +123,7 @@ (define-module (gnu services) extra-special-file etc-service-type etc-profile-d-service-type + etc-bashrc-d-service-type etc-directory privileged-program-service-type setuid-program-service-type ; deprecated @@ -988,6 +989,19 @@ (define etc-profile-d-service-type scripts having the @file{.sh} file extension, to be sourced when users log in."))) +(define files->bashrc-d-directory + (make-files->etc-directory "bashrc.d")) + +(define etc-bashrc-d-service-type + (service-type + (inherit etc-profile-d-service-type) + (name 'etc-bashrc-d) + (extensions (list (service-extension etc-service-type + files->bashrc-d-directory))) + (description "A service for populating @file{/etc/bashrc.d/} with Bash +scripts having the @file{.sh} file extension, to be sourced by interactive +Bash shells."))) + (define (privileged-program->activation-gexp programs) "Return an activation gexp for privileged-program from PROGRAMS." (let ((programs diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 988212b4a7a..edb7e9112ba 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -178,6 +178,19 @@ (define* (run-basic-test os command #:optional (name "basic") test \"$PROFILE_D_OK\" = yes") marionette))) + (test-assert "/etc/bashrc.d is sourced" + (zero? (marionette-eval + '(system* "bash" + ;; Ensure Bash runs interactively. + "--init-file" + #$(plain-file "test_bashrc_d.sh" + "\ +. /etc/bashrc +set -e -x +test -f /etc/bashrc.d/test_bashrc_d.sh +test \"$BASHRC_D_OK\" = yes")) + marionette))) + (test-equal "special files" '#$special-files (marionette-eval @@ -572,15 +585,23 @@ (define* (test-basic-os #:optional (kernel linux-libre)) (operating-system (inherit %simple-os) (kernel kernel) - (services (cons (service - etc-profile-d-service-type - (list (plain-file - "test_profile_d.sh" - "export PROFILE_D_OK=yes\n") - (plain-file - "invalid-name" - "not a POSIX script -- ignore me"))) - %base-services))) + (services (cons* (service + etc-profile-d-service-type + (list (plain-file + "test_profile_d.sh" + "export PROFILE_D_OK=yes\n") + (plain-file + "invalid-name" + "not a POSIX script -- ignore me"))) + (service + etc-bashrc-d-service-type + (list (plain-file + "test_bashrc_d.sh" + "export BASHRC_D_OK=yes\n") + (plain-file + "invalid-name" + "not a Bash script -- ignore me"))) + %base-services))) #:imported-modules '((gnu services herd) (guix combinators)))) (vm (virtual-machine os)))