diff options
author | Alex Griffin <a@ajgrf.com> | 2022-02-07 18:37:25 -0600 |
---|---|---|
committer | Mathieu Othacehe <othacehe@gnu.org> | 2022-09-24 14:49:09 +0200 |
commit | 233cf9f0367e78562f07ac9885ed2cc6defe17e1 (patch) | |
tree | c97b3f93c1ad2913d8c589b06401ad75f56055d3 | |
parent | 8757c3f2934352fe8ad9a86f6e6f1d4b7245644d (diff) | |
download | guix-233cf9f0367e78562f07ac9885ed2cc6defe17e1.tar.gz |
system: image: Add wsl2 support.
* gnu/image.scm (<image>)[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.
-rw-r--r-- | gnu/image.scm | 2 | ||||
-rw-r--r-- | gnu/system/image.scm | 37 |
2 files changed, 35 insertions, 4 deletions
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* |