From 785919121066a10b291d783b6903b5e368e992a8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 20 Apr 2019 11:43:23 +0200 Subject: install: Pass "modprobe.blacklist=radeon". * gnu/system/install.scm (installation-os)[kernel-arguments]: New field. --- gnu/system/install.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index d887313132d..80b7fe8e69f 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -427,6 +427,12 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m (label (string-append "GNU Guix installation " (package-version guix))) + ;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon + ;; non-functional: + ;; . + ;; Thus, blacklist it. + (kernel-arguments '("modprobe.blacklist=radeon")) + (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. -- cgit v1.3 From 519177ad41b713dd963f466bf1c3c9e2eb8d1d99 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 00:40:50 +0200 Subject: install: Pass "quiet" to the kernel. This is a followup to 5582aa8e31bf88f981caedeb4fbbb758486b6ca7. * gnu/system/install.scm (installation-os)[kernel-arguments]: Add "quiet". --- gnu/system/install.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/system') diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 80b7fe8e69f..f20d94f385e 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -431,7 +431,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; non-functional: ;; . ;; Thus, blacklist it. - (kernel-arguments '("modprobe.blacklist=radeon")) + (kernel-arguments '("quiet" "modprobe.blacklist=radeon")) (file-systems ;; Note: the disk image build code overrides this root file system with -- cgit v1.3 From 051b279fd08eec80cda248aa12e6875005b7dc4f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 14:51:47 +0200 Subject: services: account: Make 'user-homes' a one-shot service. * gnu/system/shadow.scm (account-shepherd-service): Add 'one-shot?' field. Return #t from 'start'. --- gnu/system/shadow.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 7dc36f4a451..13b8b140954 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -323,6 +323,7 @@ accounts among ACCOUNTS+GROUPS." (list (shepherd-service (requirement '(file-systems)) (provision '(user-homes)) + (one-shot? #t) (modules '((gnu build activation) (gnu system accounts))) (start (with-imported-modules (source-module-closure @@ -332,9 +333,7 @@ accounts among ACCOUNTS+GROUPS." (activate-user-home (map sexp->user-account (list #$@(map user-account->gexp accounts)))) - #f))) ;stop - (stop #~(const #f)) - (respawn? #f) + #t))) ;success (documentation "Create user home directories.")))) (define (shells-file shells) -- cgit v1.3 From 86b8869ffffad96e06e98d523f287b25684a6fa6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 23 Apr 2019 15:08:31 +0200 Subject: linux-container: Remove '%containerized-shepherd-service' hack. This hack worked around a defect in the Shepherd 0.5.0 and is no longer needed. * gnu/services/shepherd.scm (%containerized-shepherd-service): Remove. * gnu/system/linux-container.scm (container-essential-services): Don't use it. --- gnu/services/shepherd.scm | 16 ---------------- gnu/system/linux-container.scm | 3 +-- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'gnu/system') diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 21baacbaf70..45c67e04ebc 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -60,7 +60,6 @@ %default-modules shepherd-service-file - %containerized-shepherd-service shepherd-service-lookup-procedure shepherd-service-back-edges @@ -346,21 +345,6 @@ symbols provided/required by a service." (lambda (service) (vhash-foldq* cons '() service edges))) -(define %containerized-shepherd-service - ;; XXX: This service works around a bug in the Shepherd 0.5.0: shepherd - ;; calls reboot(2) (via 'disable-reboot-on-ctrl-alt-del') when it starts, - ;; but in a container that fails with EINVAL. This was fixed in Shepherd - ;; commit 92e806bac1abaeeaf5d60f0ab50d1ae85ba6a62f. - (simple-service 'containerized-shepherd - shepherd-root-service-type - (list (shepherd-service - (provision '(containerized-shepherd)) - (start #~(lambda () - (set! (@@ (shepherd) - disable-reboot-on-ctrl-alt-del) - (const #t)) - #t)))))) - (define (shepherd-service-upgrade live target) "Return two values: the subset of LIVE (a list of ) that needs to be unloaded, and the subset of TARGET (a list of ) that diff --git a/gnu/system/linux-container.scm b/gnu/system/linux-container.scm index 37a053cdc38..149c3d08a32 100644 --- a/gnu/system/linux-container.scm +++ b/gnu/system/linux-container.scm @@ -29,7 +29,6 @@ #:use-module (gnu build linux-container) #:use-module (gnu services) #:use-module (gnu services base) - #:use-module (gnu services shepherd) #:use-module (gnu system) #:use-module (gnu system file-systems) #:export (system-container @@ -52,7 +51,7 @@ from OS that are needed on the bare metal and not in a container." (let ((locale (operating-system-locale-directory os))) (with-monad %store-monad (return `(("locale" ,locale)))))) - (append base (list %containerized-shepherd-service)))) + base)) (define (containerized-operating-system os mappings) "Return an operating system based on OS for use in a Linux container -- cgit v1.3