blob: 6779337e09708a4b698432a7d2b690f95a1790f2 (
about) (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
2022-03-01 | initrd: Honor rootfstype and rootflags command-line parameters....* gnu/build/linux-boot.scm (boot-system): Honor rootfstype and rootflags
arguments. Update doc. Error out in case there is insufficient information
with regard to the root file system.
Restore the behavior of inferring the root device from the root file system
from the operating system in case the root argument is not provided.
* doc/guix.texi (Initial RAM Disk): Document the new command-line parameters.
| Maxim Cournoyer | |
2022-03-01 | initrd: Use non-hyphenated kernel command-line parameter names....This is to make it less surprising, given the common convention sets forth by
the kernel Linux command-line parameters.
* gnu/build/linux-boot.scm (boot-system): Rename '--load', '--repl', '--root'
and '--system' to 'gnu.load', 'gnu.repl', 'root' and 'gnu.system',
respectively. Adjust doc.
(find-long-option): Adjust doc.
* gnu/installer/parted.scm (installer-root-partition-path): Adjust accordingly.
* gnu/system.scm (bootable-kernel-arguments): Add a VERSION argument and
update doc. Use VERSION to conditionally return old style vs new style initrd
arguments.
(%boot-parameters-version): Increment to 1.
(operating-system-boot-parameters): Adjust doc.
(operating-system-boot-parameters-file): Likewise.
* gnu/system/linux-initrd.scm (raw-initrd, base-initrd): Likewise.
* doc/guix.texi: Adjust doc.
* gnu/build/activation.scm (boot-time-system): Adjust accordingly.
* gnu/build/hurd-boot.scm (boot-hurd-system): Likewise.
* gnu/packages/commencement.scm (%final-inputs-riscv64): Adjust comment.
| Maxim Cournoyer |
97'>97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022–2023 Bruno Victal <mirai@makinata.eu>.
;;;
;;; This file is part of GNU Guix.
;;;
;;; GNU Guix is free software; you can redistribute it and/or modify it
;;; under the terms of the GNU General Public License as published by
;;; the Free Software Foundation; either version 3 of the License, or (at
;;; your option) any later version.
;;;
;;; GNU Guix is distributed in the hope that it will be useful, but
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;; GNU General Public License for more details.
;;;
;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu tests gdm)
#:use-module (gnu tests)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages ocr)
#:use-module (gnu services)
#:use-module (gnu services desktop)
#:use-module (gnu services xorg)
#:use-module (gnu system)
#:use-module (gnu system vm)
#:use-module (guix gexp)
#:use-module (ice-9 format)
#:export (%test-gdm-x11
%test-gdm-wayland))
(define* (make-os #:key wayland?)
(operating-system
(inherit %simple-os)
(services
(modify-services %desktop-services
(gdm-service-type config => (gdm-configuration
(inherit config)
(wayland? wayland?)))))))
(define* (run-gdm-test #:key wayland?)
"Run tests in a vm which has gdm running."
(define os
(marionette-operating-system
(make-os #:wayland? wayland?)
#:imported-modules '((gnu services herd))))
(define vm
(virtual-machine
(operating-system os)
(memory-size 1024)))
(define name (format #f "gdm-~:[x11~;wayland~]" wayland?))
(define test
(with-imported-modules '((gnu build marionette))
#~(begin
(use-modules (gnu build marionette)
(ice-9 format)
(srfi srfi-26)
(srfi srfi-64))
(let ((marionette (make-marionette (list #$vm)))
(expected-session-type #$(if wayland? "wayland" "x11")))
(test-runner-current (system-test-runner #$output))
(test-begin #$name)
;; service for gdm is called xorg-server
(test-assert "service is running"
(marionette-eval
'(begin
(use-modules (gnu services herd))
(start-service 'xorg-server))
marionette))
(test-group "gdm ready"
(test-assert "PID file present"
(wait-for-file "/var/run/gdm/gdm.pid" marionette))
;; Waiting for gdm.pid is not enough, tests may still sporadically
;; fail; ensure that the login screen is up.
;; XXX: GNU Ocrad works but with '--invert' only.
(test-assert "login screen up"
(wait-for-screen-text marionette
(cut string-contains <> "Guix")
#:ocr #$(file-append ocrad "/bin/ocrad")
#:ocr-arguments '("--invert")
#:timeout 120))) ;for slow systems
(test-equal (string-append "session-type is " expected-session-type)
expected-session-type
(marionette-eval
'(begin
(use-modules (ice-9 popen)
(ice-9 rdelim))
(let* ((loginctl #$(file-append elogind "/bin/loginctl"))
(get-session-cmd (string-join `(,loginctl "show-user" "gdm"
"--property Display" "--value")))
(session (call-with-port (open-input-pipe get-session-cmd) read-line))
(get-type-cmd (string-join `(,loginctl "show-session" ,session
"--property Type" "--value")))
(type (call-with-port (open-input-pipe get-type-cmd) read-line)))
type))
marionette))
(test-end)))))
(gexp->derivation (string-append name "-test") test))
(define %test-gdm-x11
(system-test
(name "gdm-x11")
(description "Basic tests for the GDM service. (X11)")
(value (run-gdm-test))))
(define %test-gdm-wayland
(system-test
(name "gdm-wayland")
(description "Basic tests for the GDM service. (Wayland)")
(value (run-gdm-test #:wayland? #t))))
|