diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/tests/install.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/tests/install.scm')
| -rw-r--r-- | gnu/tests/install.scm | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 98de4c8359..ae8c6051f1 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <[email protected]> +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <[email protected]> ;;; Copyright © 2017, 2019, 2021 Tobias Geerinckx-Rice <[email protected]> ;;; Copyright © 2020 Mathieu Othacehe <[email protected]> ;;; Copyright © 2020 Danny Milosavljevic <[email protected]> @@ -31,7 +31,7 @@ #:use-module (gnu system image) #:use-module (gnu system install) #:use-module (gnu system vm) - #:use-module ((gnu build vm) #:select (qemu-command)) + #:use-module ((gnu build marionette) #:select (qemu-command)) #:use-module (gnu packages admin) #:use-module (gnu packages bootloaders) #:use-module (gnu packages commencement) ;for 'guile-final' @@ -355,7 +355,7 @@ IMAGE, a disk image. The QEMU VM has access to MEMORY-SIZE MiB of RAM." (format #t "creating writable image from '~a'...~%" image) (unless (zero? (system* #+(file-append qemu-minimal "/bin/qemu-img") - "create" "-f" "qcow2" + "create" "-f" "qcow2" "-F" "qcow2" "-o" (string-append "backing_file=" image) "disk.img")) @@ -925,7 +925,7 @@ reboot\n") (operating-system (host-name "bootroot") - (timezone "Europe/Madrid") + (timezone "Europe/Paris") (locale "en_US.UTF-8") (bootloader (bootloader-configuration @@ -1168,7 +1168,7 @@ RAID-0 (stripe) root partition.") (operating-system (host-name "hurd") - (timezone "America/Montreal") + (timezone "Europe/Paris") (locale "en_US.UTF-8") (bootloader (bootloader-configuration (bootloader grub-bootloader) @@ -1679,11 +1679,15 @@ build (current-guix) and then store a couple of full system images.") ;; encryption support. The installer produces a UUID for the partition; ;; this "UUID" is explicitly set in 'gui-test-program' to the value shown ;; below. - (swap-devices (if encrypted? - '() - (list (uuid "11111111-2222-3333-4444-123456789abc")))) - (services (cons (service dhcp-client-service-type) - (operating-system-user-services %minimal-os-on-vda))))) + (swap-devices + (if encrypted? + '() + (list + (swap-space + (target (uuid "11111111-2222-3333-4444-123456789abc")))))) + (services (cons* (service dhcp-client-service-type) + (service ntp-service-type) + (operating-system-user-services %minimal-os-on-vda))))) (define* (installation-target-desktop-os-for-gui-tests #:key (encrypted? #f)) |