From 72e724cef438a7e16052dd1a38bf03027635f2bc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 19 Mar 2026 18:46:45 +0100 Subject: services, tests: Refer to inherited field values where applicable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- gnu/system/vm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index a3db2991d60..626b5039acc 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2025 Ludovic Courtès +;;; Copyright © 2013-2026 Ludovic Courtès ;;; Copyright © 2016 Christine Lemmer-Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -185,7 +185,7 @@ environment with the store shared with the host. MAPPINGS is a list of ;; XXX In 6.14, the kernel renamed the "cirrus" module to "cirrus-qemu", so ;; we account for that here. The renaming was done in this commit: ;; https://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git/commit/?id=5c3c99868aa2e0b68ac69f8050a6b9c994e73397 - (initrd-modules (let* ((modules (operating-system-initrd-modules os)) + (initrd-modules (let* ((modules initrd-modules) (kernel-version (package-version (operating-system-kernel os))) (cirrus-module -- cgit v1.3