diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2026-03-19 18:46:45 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-03-20 13:27:16 +0100 |
| commit | 72e724cef438a7e16052dd1a38bf03027635f2bc (patch) | |
| tree | ec6ea468ae736b115af16611ec70bb136054171b /gnu/tests | |
| parent | 1ae20f03f43a2af2bcde3751a2809fe152298d34 (diff) | |
services, tests: Refer to inherited field values where applicable.
* gnu/machine/hetzner.scm (operating-system-authorize): Refer to ‘services’
instead of calling ‘operating-system-user-services’.
* gnu/services/virtualization.scm (secret-service-operating-system): Likewise.
* gnu/tests.scm (operating-system-with-console-syslog): Likewise.
* gnu/tests/avahi.scm (%avahi-os): Likewise.
* gnu/tests/base.scm (%test-guix-daemon-unprivileged): Likewise.
* gnu/tests/nfs.scm (%nfs-os): Likewise.
(run-nfs-full-test): Likewise.
* gnu/system/vm.scm (virtualized-operating-system): Refer to ‘initrd-modules’
instead of calling ‘operating-system-initrd-modules’.
Change-Id: I00c5f5c1e171b174bf0ca709b2dbd13a2fe161b5
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/avahi.scm | 5 | ||||
| -rw-r--r-- | gnu/tests/base.scm | 4 | ||||
| -rw-r--r-- | gnu/tests/nfs.scm | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/gnu/tests/avahi.scm b/gnu/tests/avahi.scm index d7f2fdaa72d..21d8995a6d5 100644 --- a/gnu/tests/avahi.scm +++ b/gnu/tests/avahi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2020, 2022, 2024-2025 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2020, 2022, 2024-2026 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,8 +46,7 @@ (service dhcpcd-service-type) ;needed for multicast ;; Enable heavyweight debugging output. - (modify-services (operating-system-user-services - %simple-os) + (modify-services services (nscd-service-type config => (nscd-configuration (inherit config) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index b65e54222cd..92bf4b4a11e 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2020, 2022, 2024-2025 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2020, 2022, 2024-2026 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2022, 2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org> @@ -1348,7 +1348,7 @@ runs unprivileged.") (group "users")) %base-user-accounts)) (services - (modify-services (operating-system-user-services base) + (modify-services services (guix-service-type config => (guix-configuration (inherit config) diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 0453d453820..e760c4502a1 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2017, 2020-2021, 2025 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2017, 2020-2021, 2025-2026 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> @@ -170,7 +170,7 @@ %base-file-systems)) (services ;; Enable debugging output. - (modify-services (operating-system-user-services os) + (modify-services services (shepherd-system-log-service-type config => @@ -285,7 +285,7 @@ directories can be mounted.") (exports '(("/export" "*(rw,insecure,no_subtree_check,\ crossmnt,fsid=root,no_root_squash,insecure,async)"))))) - (modify-services (operating-system-user-services os) + (modify-services services (shepherd-system-log-service-type config => |