From c009c286a23f48b56731c3e7bc4875a9e88857c4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 5 Sep 2022 18:12:22 +0200 Subject: image: Make the operating-system field mandatory. Make the operating-system field mandatory as creating an image without it makes no sense. Introduce a new macro, image-without-os for the specific cases where the image is only created to be inherited from afterwards. * gnu/image.scm ()[operating-system]: Make it mandatory. * gnu/system/image.scm (image-without-os): New macro. (efi-disk-image, efi32-disk-image, iso9660-image, docker-image, raw-with-offset-disk-image): Use it. * gnu/system/images/hurd.scm (hurd-disk-image): Ditto. --- gnu/system/image.scm | 17 ++++++++++++----- gnu/system/images/hurd.scm | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/image.scm b/gnu/system/image.scm index a04363a130..c59b7eafd7 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -65,6 +65,7 @@ #:use-module (ice-9 match) #:export (root-offset root-label + image-without-os esp-partition esp32-partition @@ -102,6 +103,12 @@ ;; Generic root partition label. (define root-label "Guix_image") +(define-syntax-rule (image-without-os . fields) + "Return an image record with the mandatory operating-system field set to +#false. This is useful when creating an image record that will serve as a +parent image record." + (image (operating-system #false) . fields)) + (define esp-partition (partition (size (* 40 (expt 2 20))) @@ -127,17 +134,17 @@ (initializer (gexp initialize-root-partition)))) (define efi-disk-image - (image + (image-without-os (format 'disk-image) (partitions (list esp-partition root-partition)))) (define efi32-disk-image - (image + (image-without-os (format 'disk-image) (partitions (list esp32-partition root-partition)))) (define iso9660-image - (image + (image-without-os (format 'iso9660) (partitions (list (partition @@ -146,11 +153,11 @@ (flags '(boot))))))) (define docker-image - (image + (image-without-os (format 'docker))) (define* (raw-with-offset-disk-image #:optional (offset root-offset)) - (image + (image-without-os (format 'disk-image) (partitions (list (partition diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 6da09b855a..2c64117c08 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -74,7 +74,7 @@ #:wal-mode? #f))))) (define hurd-disk-image - (image + (image-without-os (format 'disk-image) (platform hurd) (partitions -- cgit v1.2.3 From 08a7eb187f09aeefbb03b8b28b0d67aab33d4a06 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 24 Sep 2022 14:46:47 +0200 Subject: platforms: x86: Rename Hurd hurd to i586-gnu. * guix/platforms/x86.scm (hurd): Rename it to ... (i586-gnu): ... this variable. * gnu/system/images/hurd.scm (hurd-disk-image, hurd-barebones-disk-image, hurd-barebones-qcow2-image): Adapt those. --- gnu/system/images/hurd.scm | 6 +++--- guix/platforms/x86.scm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 2c64117c08..9b618f7dc6 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -76,7 +76,7 @@ (define hurd-disk-image (image-without-os (format 'disk-image) - (platform hurd) + (platform i586-gnu) (partitions (list (partition (size 'guess) @@ -104,14 +104,14 @@ (define hurd-barebones-disk-image (image (inherit - (os+platform->image hurd-barebones-os hurd + (os+platform->image hurd-barebones-os i586-gnu #:type hurd-image-type)) (name 'hurd-barebones-disk-image))) (define hurd-barebones-qcow2-image (image (inherit - (os+platform->image hurd-barebones-os hurd + (os+platform->image hurd-barebones-os i586-gnu #:type hurd-qcow2-image-type)) (name 'hurd-barebones.qcow2))) diff --git a/guix/platforms/x86.scm b/guix/platforms/x86.scm index 5338049d6f..6f547dd770 100644 --- a/guix/platforms/x86.scm +++ b/guix/platforms/x86.scm @@ -23,7 +23,7 @@ x86_64-linux i686-mingw x86_64-mingw - hurd)) + i586-gnu)) (define i686-linux (platform @@ -51,7 +51,7 @@ (system #f) (glibc-dynamic-linker #f))) -(define hurd +(define i586-gnu (platform (target "i586-pc-gnu") (system "i586-gnu") -- cgit v1.2.3 From 8757c3f2934352fe8ad9a86f6e6f1d4b7245644d Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sun, 6 Feb 2022 16:29:47 -0600 Subject: system: image: Add tarball support. * gnu/image.scm ()[fields]: Add tarball to the supported formats. * gnu/system/image.scm (tarball-image, tarball-image-type): New variables. (system-tarball-image): New procedure. (image->root-file-system): Add tarball image support. (system-image): Ditto. * doc/guix.texi ("System Images"): Document it. Signed-off-by: Mathieu Othacehe --- doc/guix.texi | 2 ++ gnu/image.scm | 2 +- gnu/system/image.scm | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 84 insertions(+), 2 deletions(-) (limited to 'gnu/system') diff --git a/doc/guix.texi b/doc/guix.texi index 4b3920842d..6c44c22a32 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41474,6 +41474,8 @@ one or multiple partitions. @item @code{iso9660}, an ISO-9660 image. +@item @code{tarball}, a tar.gz image archive. + @end itemize @item @code{platform} (default: @code{#false}) diff --git a/gnu/image.scm b/gnu/image.scm index 68784deb12..b2ef0f60af 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -152,7 +152,7 @@ that is not in SET, mentioning FIELD in the error message." ;; The supported image formats. (define-set-sanitizer validate-image-format format - (disk-image compressed-qcow2 docker iso9660)) + (disk-image compressed-qcow2 docker iso9660 tarball)) ;; The supported partition table types. (define-set-sanitizer validate-partition-table-type partition-table-type diff --git a/gnu/system/image.scm b/gnu/system/image.scm index c59b7eafd7..d60649b6e3 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2022 Pavel Shlyak ;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2022 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,6 +33,7 @@ #:use-module ((guix self) #:select (make-config.scm)) #:use-module (gnu bootloader) #:use-module (gnu bootloader grub) + #:use-module (gnu compression) #:use-module (gnu image) #:use-module (guix platform) #:use-module (gnu services) @@ -74,6 +76,7 @@ efi-disk-image iso9660-image docker-image + tarball-image raw-with-offset-disk-image image-with-os @@ -83,6 +86,7 @@ iso-image-type uncompressed-iso-image-type docker-image-type + tarball-image-type raw-with-offset-image-type image-with-label @@ -156,6 +160,10 @@ parent image record." (image-without-os (format 'docker))) +(define tarball-image + (image-without-os + (format 'tarball))) + (define* (raw-with-offset-disk-image #:optional (offset root-offset)) (image-without-os (format 'disk-image) @@ -218,6 +226,11 @@ set to the given OS." (name 'docker) (constructor (cut image-with-os docker-image <>)))) +(define tarball-image-type + (image-type + (name 'tarball) + (constructor (cut image-with-os tarball-image <>)))) + (define raw-with-offset-image-type (image-type (name 'raw-with-offset) @@ -688,6 +701,71 @@ output file." #:options `(#:references-graphs ((,graph ,os)) #:substitutable? ,substitutable?)))) + +;; +;; Tarball image. +;; + +(define* (system-tarball-image image + #:key + (name "image") + (compressor (srfi-1:first %compressors))) + "Build a tarball of IMAGE. NAME is the base name to use for the +output file." + (let* ((os (image-operating-system image)) + (substitutable? (image-substitutable? image)) + (schema (local-file (search-path %load-path + "guix/store/schema.sql"))) + (name (string-append name ".tar" (compressor-extension compressor))) + (graph "system-graph")) + (define builder + (with-extensions gcrypt-sqlite3&co ;for (guix store database) + (with-imported-modules `(,@(source-module-closure + '((guix build pack) + (guix build store-copy) + (guix build utils) + (guix store database) + (gnu build image)) + #:select? not-config?) + ((guix config) => ,(make-config.scm))) + #~(begin + (use-modules (guix build pack) + (guix build store-copy) + (guix build utils) + (guix store database) + (gnu build image)) + + ;; Set the SQL schema location. + (sql-schema #$schema) + + ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + + (let ((image-root (string-append (getcwd) "/tmp-root")) + (tar #+(file-append tar "/bin/tar"))) + + (mkdir-p image-root) + (initialize-root-partition image-root + #:references-graphs '(#$graph) + #:deduplicate? #f + #:system-directory #$os) + + (with-directory-excursion image-root + (apply invoke tar "-cvf" #$output "." + (tar-base-options + #:tar tar + #:compressor + #+(and=> compressor compressor-command))))))))) + + (computed-file name builder + ;; Allow offloading so that this I/O-intensive process + ;; doesn't run on the build farm's head node. + #:local-build? #f + #:options `(#:references-graphs ((,graph ,os)) + #:substitutable? ,substitutable?)))) + ;; ;; Image creation. @@ -697,7 +775,7 @@ output file." "Return the IMAGE root partition file-system type." (case (image-format image) ((iso9660) "iso9660") - ((docker) "dummy") + ((docker tarball) "dummy") (else (partition-file-system (find-root-partition image))))) @@ -834,6 +912,8 @@ image, depending on IMAGE format." ("bootcfg" ,bootcfg)))) ((memq image-format '(docker)) (system-docker-image image*)) + ((memq image-format '(tarball)) + (system-tarball-image image*)) ((memq image-format '(iso9660)) (system-iso9660-image image* -- cgit v1.2.3 From 233cf9f0367e78562f07ac9885ed2cc6defe17e1 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Mon, 7 Feb 2022 18:37:25 -0600 Subject: system: image: Add wsl2 support. * gnu/image.scm ()[format]: Add wsl2 support. * gnu/system/image.scm (wsl2-image, wsl2-image-type): New variables. (image->root-file-system): Add wsl2 image support. (system-image): Ditto. --- gnu/image.scm | 2 +- gnu/system/image.scm | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 4 deletions(-) (limited to 'gnu/system') diff --git a/gnu/image.scm b/gnu/image.scm index b2ef0f60af..523653dd77 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -152,7 +152,7 @@ that is not in SET, mentioning FIELD in the error message." ;; The supported image formats. (define-set-sanitizer validate-image-format format - (disk-image compressed-qcow2 docker iso9660 tarball)) + (disk-image compressed-qcow2 docker iso9660 tarball wsl2)) ;; The supported partition table types. (define-set-sanitizer validate-partition-table-type partition-table-type diff --git a/gnu/system/image.scm b/gnu/system/image.scm index d60649b6e3..2eec6fcbab 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -39,12 +39,14 @@ #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu system) + #:use-module (gnu system accounts) #:use-module (gnu system file-systems) #:use-module (gnu system linux-container) #:use-module (gnu system uuid) #:use-module (gnu system vm) #:use-module (guix packages) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bootloaders) #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) @@ -77,6 +79,7 @@ iso9660-image docker-image tarball-image + wsl2-image raw-with-offset-disk-image image-with-os @@ -87,6 +90,7 @@ uncompressed-iso-image-type docker-image-type tarball-image-type + wsl2-image-type raw-with-offset-image-type image-with-label @@ -164,6 +168,10 @@ parent image record." (image-without-os (format 'tarball))) +(define wsl2-image + (image-without-os + (format 'wsl2))) + (define* (raw-with-offset-disk-image #:optional (offset root-offset)) (image-without-os (format 'disk-image) @@ -231,6 +239,11 @@ set to the given OS." (name 'tarball) (constructor (cut image-with-os tarball-image <>)))) +(define wsl2-image-type + (image-type + (name 'wsl2) + (constructor (cut image-with-os wsl2-image <>)))) + (define raw-with-offset-image-type (image-type (name 'raw-with-offset) @@ -709,7 +722,8 @@ output file." (define* (system-tarball-image image #:key (name "image") - (compressor (srfi-1:first %compressors))) + (compressor (srfi-1:first %compressors)) + (wsl? #f)) "Build a tarball of IMAGE. NAME is the base name to use for the output file." (let* ((os (image-operating-system image)) @@ -717,7 +731,12 @@ output file." (schema (local-file (search-path %load-path "guix/store/schema.sql"))) (name (string-append name ".tar" (compressor-extension compressor))) - (graph "system-graph")) + (graph "system-graph") + (root (srfi-1:find (lambda (user) + (and=> (user-account-uid user) zero?)) + (operating-system-users os))) + (root-shell (or (and=> root user-account-shell) + (file-append bash "/bin/bash")))) (define builder (with-extensions gcrypt-sqlite3&co ;for (guix store database) (with-imported-modules `(,@(source-module-closure @@ -753,6 +772,16 @@ output file." #:system-directory #$os) (with-directory-excursion image-root + #$@(if wsl? + #~(;; WSL requires /bin/sh. Will be overwritten by + ;; system activation. + (symlink #$root-shell "./bin/sh") + + ;; WSL requires /bin/mount to access the host fs. + (symlink #$(file-append util-linux "/bin/mount") + "./bin/mount")) + #~()) + (apply invoke tar "-cvf" #$output "." (tar-base-options #:tar tar @@ -775,7 +804,7 @@ output file." "Return the IMAGE root partition file-system type." (case (image-format image) ((iso9660) "iso9660") - ((docker tarball) "dummy") + ((docker tarball wsl2) "dummy") (else (partition-file-system (find-root-partition image))))) @@ -914,6 +943,8 @@ image, depending on IMAGE format." (system-docker-image image*)) ((memq image-format '(tarball)) (system-tarball-image image*)) + ((memq image-format '(wsl2)) + (system-tarball-image image* #:wsl? #t)) ((memq image-format '(iso9660)) (system-iso9660-image image* -- cgit v1.2.3 From c8112f3bd95269ce4aca12dedbfe61bb6b37acae Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 10 Sep 2022 10:03:10 +0200 Subject: system: images: Add wsl2 module. * gnu/system/images/wsl2.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * doc/guix.texi ("System Images"): Document it. Signed-off-by: Mathieu Othacehe --- doc/guix.texi | 13 ++++ gnu/local.mk | 2 + gnu/system/images/wsl2.scm | 170 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 185 insertions(+) create mode 100644 gnu/system/images/wsl2.scm (limited to 'gnu/system') diff --git a/doc/guix.texi b/doc/guix.texi index 6c44c22a32..ba13ebf144 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -41476,6 +41476,8 @@ one or multiple partitions. @item @code{tarball}, a tar.gz image archive. +@item @code{wsl2}, a WSL2 image. + @end itemize @item @code{platform} (default: @code{#false}) @@ -41842,6 +41844,17 @@ Build an image similar to the one built by the @code{hurd-image-type} but with the @code{format} set to @code{'compressed-qcow2}. @end defvr +@defvr {Scheme Variable} wsl2-image-type +Build an image for the @acronym{WSL2, Windows Subsystem for Linux 2}. +It can be imported by running: + +@example +wsl --import Guix ./guix ./wsl2-image.tar.gz +wsl -d Guix +@end example + +@end defvr + So, if we get back to the @code{guix system image} command taking an @code{operating-system} declaration as argument. By default, the @code{efi-raw-image-type} is used to turn the provided diff --git a/gnu/local.mk b/gnu/local.mk index 4774be2688..4e982dc6e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -53,6 +53,7 @@ # Copyright © 2022 John Kehayias # Copyright © 2022 muradm # Copyright © 2022 Hilton Chain +# Copyright © 2022 Alex Griffin # # This file is part of GNU Guix. # @@ -718,6 +719,7 @@ GNU_SYSTEM_MODULES = \ %D%/system/images/pine64.scm \ %D%/system/images/pinebook-pro.scm \ %D%/system/images/rock64.scm \ + %D%/system/images/wsl2.scm \ \ %D%/machine.scm \ \ diff --git a/gnu/system/images/wsl2.scm b/gnu/system/images/wsl2.scm new file mode 100644 index 0000000000..15cb4f69b8 --- /dev/null +++ b/gnu/system/images/wsl2.scm @@ -0,0 +1,170 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Alex Griffin +;;; Copyright © 2022 Mathieu Othacehe +;;; +;;; 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 . + +(define-module (gnu system images wsl2) + #:use-module (gnu bootloader) + #:use-module (gnu image) + #:use-module (gnu packages admin) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages guile) + #:use-module (gnu packages linux) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu system) + #:use-module (gnu system image) + #:use-module (gnu system shadow) + #:use-module (guix build-system trivial) + #:use-module (guix gexp) + #:use-module (guix packages) + #:export (wsl-boot-program + wsl-os + wsl2-image)) + +(define (wsl-boot-program user) + "Program that runs the system boot script, then starts a login shell as +USER." + (program-file + "wsl-boot-program" + (with-imported-modules '((guix build syscalls)) + #~(begin + (use-modules (guix build syscalls)) + (unless (file-exists? "/run/current-system") + (let ((shepherd-socket "/var/run/shepherd/socket")) + ;; Clean up this file so we can wait for it later. + (when (file-exists? shepherd-socket) + (delete-file shepherd-socket)) + + ;; Child process boots the system and is replaced by shepherd. + (when (zero? (primitive-fork)) + (let* ((system-generation + (readlink "/var/guix/profiles/system")) + (system (readlink + (string-append + (if (absolute-file-name? system-generation) + "" + "/var/guix/profiles/") + system-generation)))) + (setenv "GUIX_NEW_SYSTEM" system) + (execl #$(file-append guile-3.0 "/bin/guile") + "guile" + "--no-auto-compile" + (string-append system "/boot")))) + + ;; Parent process waits for shepherd before continuing. + (while (not (file-exists? shepherd-socket)) + (sleep 1)))) + + (let* ((pw (getpw #$user)) + (shell (passwd:shell pw)) + (sudo #+(file-append sudo "/bin/sudo")) + (args (cdr (command-line)))) + ;; Save the value of $PATH set by WSL. Useful for finding + ;; Windows binaries to run with WSL's binfmt interop. + (setenv "WSLPATH" (getenv "PATH")) + + ;; /run is mounted with the nosuid flag by WSL. This prevents + ;; running the /run/setuid-programs. Remount it without this flag + ;; as a workaround. See: + ;; https://github.com/microsoft/WSL/issues/8716. + (mount #f "/run" #f + MS_REMOUNT + #:update-mtab? #f) + + ;; Start login shell as user. + (apply execl sudo "sudo" + "--preserve-env=WSLPATH" + "-u" #$user + "--" + shell "-l" args)))))) + +(define dummy-package + (package + (name "dummy") + (version "0") + (source #f) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:target #f + #:builder (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (dummy (string-append out "/dummy"))) + (mkdir-p out) + (call-with-output-file dummy + (const #t)))))) + (home-page #f) + (synopsis #f) + (description #f) + (license #f))) + +(define dummy-bootloader + (bootloader + (name 'dummy-bootloader) + (package dummy-package) + (configuration-file "/dev/null") + (configuration-file-generator + (lambda (. _rest) + (plain-file "dummy-bootloader" ""))) + (installer #~(const #t)))) + +(define dummy-kernel dummy-package) + +(define (dummy-initrd . _rest) + (plain-file "dummy-initrd" "")) + +(define-public wsl-os + (operating-system + (host-name "gnu") + (timezone "Etc/UTC") + (bootloader + (bootloader-configuration + (bootloader dummy-bootloader))) + (kernel dummy-kernel) + (initrd dummy-initrd) + (initrd-modules '()) + (firmware '()) + (file-systems '()) + (users (cons* (user-account + (name "guest") + (group "users") + (supplementary-groups '("wheel")) ; allow use of sudo + (password "") + (comment "Guest of GNU")) + (user-account + (inherit %root-account) + (shell (wsl-boot-program "guest"))) + %base-user-accounts)) + (services + (list + (service guix-service-type) + (service special-files-service-type + `(("/bin/sh" ,(file-append bash "/bin/bash")) + ("/bin/mount" ,(file-append util-linux "/bin/mount")) + ("/usr/bin/env" ,(file-append coreutils "/bin/env")))))))) + +(define wsl2-image + (image + (inherit + (os->image wsl-os + #:type wsl2-image-type)) + (name 'wsl2-image))) + +wsl2-image -- cgit v1.2.3 From 2784fcf14d1ddb1bda28b44a433864dd3bd8333c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 25 Sep 2022 09:25:49 +0200 Subject: system: images: Add a TODO comment. * gnu/system/image.scm (system-tarball-image): Add it. --- gnu/system/image.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 2eec6fcbab..5fc0d55d9a 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -715,10 +715,11 @@ output file." #:substitutable? ,substitutable?)))) -;; -;; Tarball image. -;; +;;; +;;; Tarball image. +;;; +;; TODO: Some bits can be factorized with (guix scripts pack). (define* (system-tarball-image image #:key (name "image") -- cgit v1.2.3 From f15a141cf35bd4188767f0e91c0654991d4c49e0 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 20 Sep 2022 15:03:07 +0800 Subject: file-systems: Add cgroup2 to %pseudo-file-system-types. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/system/file-systems.scm (%pseudo-file-system-types): Add cgroup2. Signed-off-by: Ludovic Courtès --- gnu/system/file-systems.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/system') diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index 464b76a2ca..f2eb2e0837 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -434,7 +434,7 @@ TARGET in the other system." (define %pseudo-file-system-types ;; List of know pseudo file system types. This is used when validating file ;; system definitions. - '("binfmt_misc" "cgroup" "debugfs" "devpts" "devtmpfs" "efivarfs" "fusectl" + '("binfmt_misc" "cgroup" "cgroup2" "debugfs" "devpts" "devtmpfs" "efivarfs" "fusectl" "hugetlbfs" "overlay" "proc" "securityfs" "sysfs" "tmpfs")) (define %fuse-control-file-system -- cgit v1.2.3