diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-02 17:31:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-05-02 17:31:28 +0200 |
| commit | 50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64 (patch) | |
| tree | 64f16d207bad28a9dfda9cce95e6337483a40066 /gnu/system.scm | |
| parent | a8cb1e72ef351330d1521833c1b270dcc0da593f (diff) | |
| parent | afc57916e5398737e13d94b3823983783221eb63 (diff) | |
| download | patches-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar patches-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system.scm')
| -rw-r--r-- | gnu/system.scm | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index 861fdd7daa..99ce66aa4f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Meiyo Peng <meiyo.peng@gmail.com> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> +;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -148,7 +149,8 @@ %base-packages-linux %base-packages-networking %base-packages-utils - %base-firmware)) + %base-firmware + %default-kernel-arguments)) ;;; Commentary: ;;; @@ -179,7 +181,7 @@ (kernel-loadable-modules operating-system-kernel-loadable-modules (default '())) ; list of packages (kernel-arguments operating-system-user-kernel-arguments - (default '("quiet"))) ; list of gexps/strings + (default %default-kernel-arguments)) ; list of gexps/strings (bootloader operating-system-bootloader) ; <bootloader-configuration> (label operating-system-label ; string (thunked) @@ -488,6 +490,17 @@ possible (that is if there's a LINUX keyword argument in the build system)." ((#:linux kernel #f) target-kernel))))) +(define %default-modprobe-blacklist + ;; List of kernel modules to blacklist by default. + '("usbmouse" ;races with bcm5974, see <https://bugs.gnu.org/35574> + "usbkbd")) ;races with usbhid, see <https://issues.guix.gnu.org/35574#18> + +(define %default-kernel-arguments + ;; Default arguments passed to the kernel. + (list (string-append "modprobe.blacklist=" + (string-join %default-modprobe-blacklist ",")) + "quiet")) + (define* (operating-system-directory-base-entries os) "Return the basic entries of the 'system' directory of OS for use as the value of the SYSTEM-SERVICE-TYPE service." |