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 | |
| parent | a8cb1e72ef351330d1521833c1b270dcc0da593f (diff) | |
| parent | afc57916e5398737e13d94b3823983783221eb63 (diff) | |
| download | guix-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar guix-50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 6 | ||||
| -rw-r--r-- | gnu/system/linux-initrd.scm | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 822c4e3cfa..7166c12bcc 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -470,12 +470,6 @@ 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: - ;; <https://lists.gnu.org/archive/html/guix-devel/2019-03/msg00441.html>. - ;; Thus, blacklist it. - (kernel-arguments '("quiet" "modprobe.blacklist=radeon")) - (file-systems ;; Note: the disk image build code overrides this root file system with ;; the appropriate one. diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 1aa3113ae5..d84f352663 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -275,6 +275,7 @@ FILE-SYSTEMS." ("btrfs" => '("btrfs")) ("iso9660" => '("isofs")) ("jfs" => '("jfs")) + ("f2fs" => '("f2fs" "crc32_generic")) (else '()))) (define (file-system-modules file-systems) |