From patchwork Thu Feb 10 06:12:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 37157 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8BBC327BBEA; Thu, 10 Feb 2022 06:14:44 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5D54C27BBE9 for ; Thu, 10 Feb 2022 06:14:44 +0000 (GMT) Received: from localhost ([::1]:46606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nI2j5-0000yH-EO for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 01:14:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nI2hl-0000xc-St for guix-patches@gnu.org; Thu, 10 Feb 2022 01:13:22 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nI2hS-0008Lh-0t for guix-patches@gnu.org; Thu, 10 Feb 2022 01:13:21 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nI2hR-0003B6-Tm for guix-patches@gnu.org; Thu, 10 Feb 2022 01:13:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53912] [PATCH 1/5] scripts: Fix typo. References: <875ypndznv.fsf@ajgrf.com> In-Reply-To: <875ypndznv.fsf@ajgrf.com> Resent-From: Alex Griffin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 06:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53912@debbugs.gnu.org Received: via spool by 53912-submit@debbugs.gnu.org id=B53912.164447354612148 (code B ref 53912); Thu, 10 Feb 2022 06:13:01 +0000 Received: (at 53912) by debbugs.gnu.org; 10 Feb 2022 06:12:26 +0000 Received: from localhost ([127.0.0.1]:53394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2gs-00039r-9f for submit@debbugs.gnu.org; Thu, 10 Feb 2022 01:12:26 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:49975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2gn-00039Y-7t for 53912@debbugs.gnu.org; Thu, 10 Feb 2022 01:12:25 -0500 Date: Thu, 10 Feb 2022 06:12:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; s=protonmail; t=1644473534; bh=ZKTWAdXnZWE9SPkmAVcuOT08fFMB0GIsbvUbNFfQ/Rs=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID; b=CRAjneJ7YihK6A7wjcwmThJ1iF8b4tsEC7Q7JAt6mMK2kf95QcCdv+U4Iur4SteFD nO6eb/m1fd8YC4GLIFt6RlHv1R4ehva6yhk7SvvxYH6JySygt1n6pK/zgrHmGHoJQO XcgfXBpcyybJmBMFtGOSP424a1Gp2TyoZQPTHg9u5tJEwF+fTfqCbygfy5ggO2nOG4 eXYOtD5uLHXSCYKXPBuH6XowYPFG9KXQHV3+ymV7a9Ot6q3QOzzYanAbmNlTcmno9+ OAGD5vU9/vXUQCUwpQjiNUrfs2+WySCum0HgY8xy77Z7Vkw3ao2bY50ZQUHZ2wmeB6 0iUAq3EXi81Aw== Message-ID: <874k57dzdc.fsf@ajgrf.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Alex Griffin X-ACL-Warn: , Alex Griffin via Guix-patches X-Patchwork-Original-From: Alex Griffin via Guix-patches via From: Alex Griffin X-getmail-retrieved-from-mailbox: Patches This patch just fixes a simple typo needed for the next patch. Thanks, – Alex Griffin From cd8b4a33da8d5a2a922da227cdb325475cffea00 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Mon, 7 Feb 2022 13:47:29 -0600 Subject: [PATCH 1/5] scripts: Fix typo. * guix/scripts/pack.scm: Fix typo. --- guix/scripts/pack.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 38bc021665..f6bca6dbdb 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Eric Bavier ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2022 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +64,7 @@ (define-module (guix scripts pack) #:use-module (ice-9 match) #:export (compressor? compressor-name - compressor-extenstion + compressor-extension compressor-command %compressors lookup-compressor -- 2.34.0 From patchwork Thu Feb 10 06:22:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 37158 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8971727BBEA; Thu, 10 Feb 2022 06:29:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CBD5527BBE9 for ; Thu, 10 Feb 2022 06:29:12 +0000 (GMT) Received: from localhost ([::1]:60398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nI2x4-0002Zk-Qe for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 01:29:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nI2r8-0007Wd-0t for guix-patches@gnu.org; Thu, 10 Feb 2022 01:23:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nI2r7-0002ie-NR for guix-patches@gnu.org; Thu, 10 Feb 2022 01:23:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nI2r7-0003U8-Kp for guix-patches@gnu.org; Thu, 10 Feb 2022 01:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53912] [PATCH 2/5] system: image: Add tarball support. References: <875ypndznv.fsf@ajgrf.com> In-Reply-To: <875ypndznv.fsf@ajgrf.com> Resent-From: Alex Griffin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 06:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "53912@debbugs.gnu.org" <53912@debbugs.gnu.org> Received: via spool by 53912-submit@debbugs.gnu.org id=B53912.164447414813336 (code B ref 53912); Thu, 10 Feb 2022 06:23:01 +0000 Received: (at 53912) by debbugs.gnu.org; 10 Feb 2022 06:22:28 +0000 Received: from localhost ([127.0.0.1]:53424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2qZ-0003T2-V8 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 01:22:28 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:62795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2qT-0003Sd-26 for 53912@debbugs.gnu.org; Thu, 10 Feb 2022 01:22:26 -0500 Date: Thu, 10 Feb 2022 06:22:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; s=protonmail; t=1644474134; bh=kcdPQ7F9u+BG85n0GVA5ib+ZMRLZzQKscfS2GJIyOs4=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID; b=ATtNqMZCJU4OhJgwBpGDq46RUD6oTa44xbxYnmu10Botja4SOcqvnaHk7af1tc9rI E8Au3bx0THBWgkgPae8qYNkgQ2J3CX6o8QFPRVrDvJ+kVZ45DAgwOQ0RQHpTCjPLoA yiG+ZrnbpKrFl8VcjJzOYV2umFjNMq05uti0UStEuj1F2ylkawDjlWKp3XMgj3ll0Q rpcWMO4niNiRWqX5NhBiIjYTBYXcF98XGWLeSMEdCB3KwXdNQdTHc7lUkgItjdyXy/ PhCbp/DQecWNhKRPSjffAvCwEp1n95CHzgogl3PHFoZgC8Dxt7F4LkSiNqoSBMqbXL RUoFBX4kPtS6g== Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Alex Griffin X-ACL-Warn: , Alex Griffin via Guix-patches X-Patchwork-Original-From: Alex Griffin via Guix-patches via From: Alex Griffin X-getmail-retrieved-from-mailbox: Patches This patch adds support for generating a tarball from operating-system definitions. --- Alex Griffin From ef951ff51bf0e2b2b50c57fbf652b0677c1e6701 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sun, 6 Feb 2022 16:29:47 -0600 Subject: [PATCH 2/5] system: image: Add tarball support. * 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. --- gnu/system/image.scm | 82 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 42e215f614..33c9c23225 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 Alex Griffin ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu system image) #:use-module (guix modules) #:use-module (guix monads) #:use-module (guix records) + #:use-module (guix scripts pack) #:use-module (guix store) #:use-module (guix ui) #:use-module (guix utils) @@ -70,6 +72,7 @@ (define-module (gnu system image) efi-disk-image iso9660-image docker-image + tarball-image raw-with-offset-disk-image image-with-os @@ -78,6 +81,7 @@ (define-module (gnu system image) iso-image-type uncompressed-iso-image-type docker-image-type + tarball-image-type raw-with-offset-image-type image-with-label @@ -135,6 +139,10 @@ (define docker-image (image (format 'docker))) +(define tarball-image + (image + (format 'tarball))) + (define* (raw-with-offset-disk-image #:optional (offset root-offset)) (image (format 'disk-image) @@ -192,6 +200,11 @@ (define docker-image-type (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) @@ -631,6 +644,71 @@ (define builder #: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* ((shared-network? (image-shared-network? image)) + (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. @@ -640,7 +718,7 @@ (define (image->root-file-system image) "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))))) @@ -778,6 +856,8 @@ (define target (cond ("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* -- 2.34.0 From patchwork Thu Feb 10 06:27:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 37159 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4CAC927BBEA; Thu, 10 Feb 2022 06:29:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B9B2927BBE9 for ; Thu, 10 Feb 2022 06:29:39 +0000 (GMT) Received: from localhost ([::1]:32874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nI2xW-00032K-SP for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 01:29:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nI2vy-00024R-Km for guix-patches@gnu.org; Thu, 10 Feb 2022 01:28:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nI2vy-0004HC-B1 for guix-patches@gnu.org; Thu, 10 Feb 2022 01:28:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nI2vy-0003d0-8m for guix-patches@gnu.org; Thu, 10 Feb 2022 01:28:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53912] [PATCH 3/5] system: image: Add wsl-tarball support. References: <875ypndznv.fsf@ajgrf.com> In-Reply-To: <875ypndznv.fsf@ajgrf.com> Resent-From: Alex Griffin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 06:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53912@debbugs.gnu.org Received: via spool by 53912-submit@debbugs.gnu.org id=B53912.164447448113939 (code B ref 53912); Thu, 10 Feb 2022 06:28:02 +0000 Received: (at 53912) by debbugs.gnu.org; 10 Feb 2022 06:28:01 +0000 Received: from localhost ([127.0.0.1]:53437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2vx-0003cl-99 for submit@debbugs.gnu.org; Thu, 10 Feb 2022 01:28:01 -0500 Received: from mail-4022.proton.ch ([185.70.40.22]:18612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2vv-0003cV-Cg for 53912@debbugs.gnu.org; Thu, 10 Feb 2022 01:28:00 -0500 Date: Thu, 10 Feb 2022 06:27:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; s=protonmail; t=1644474472; bh=c3zsOYlfNFw2RJqbnZGRw69TC5R+qQMsh6IcIkdbCGQ=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID; b=VxticU2ohSEHHykGeuxmsyxvH0kO6VsZ9SBDfa6qbmWdPIvTl8l4CSAVBww3aMuvR 9tNw5Sfa9VJNidU+i3rsy9S+yECNIFezWz9tMBjikUM+cpLCJU8cuf2y7O8d48/TsE oz+pNsovLuPIpfUO7EQZ95601kLy9kijSBsos1hx7BNHOE9KOPKnst6bOxd/zo6V65 6wiW/NwpN0A5b1eiKSqek3yQGiC7/bFJahSbbmy5IWeVEXeuh2mSXm5DgiZMb2KVZL iaFMboEXet9UHXjM0shM9rSOCBHZFRpuz6HH4A8QBpZOWZi2WzLlERppuN0zOGimjx ljgncmBAyytbw== Message-ID: <87wni3ck2v.fsf@ajgrf.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Alex Griffin X-ACL-Warn: , Alex Griffin via Guix-patches X-Patchwork-Original-From: Alex Griffin via Guix-patches via From: Alex Griffin X-getmail-retrieved-from-mailbox: Patches This patch adds the wsl-tarball image type. The difference between this and the plain tarball type is the creation of the symlinks at /bin/sh and /bin/mount. These are necessary for the first boot to work after importing. We can’t rely on special-files-service-type for this because the system is not activated yet, and the /bin/sh symlink initiates the first system activation. Thanks, – Alex Griffin From 27304913a968753f42d06eb2ae7c297873b77cb6 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Mon, 7 Feb 2022 18:37:25 -0600 Subject: [PATCH 3/5] system: image: Add wsl-tarball support. * gnu/system/image.scm (wsl-tarball-image, wsl-tarball-image-type): New variables. (image->root-file-system): Add wsl-tarball image support. (system-image): Ditto. --- gnu/system/image.scm | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 33c9c23225..83a2a76a9c 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -37,12 +37,14 @@ (define-module (gnu system image) #: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) @@ -73,6 +75,7 @@ (define-module (gnu system image) iso9660-image docker-image tarball-image + wsl-tarball-image raw-with-offset-disk-image image-with-os @@ -82,6 +85,7 @@ (define-module (gnu system image) uncompressed-iso-image-type docker-image-type tarball-image-type + wsl-tarball-image-type raw-with-offset-image-type image-with-label @@ -143,6 +147,10 @@ (define tarball-image (image (format 'tarball))) +(define wsl-tarball-image + (image + (format 'wsl-tarball))) + (define* (raw-with-offset-disk-image #:optional (offset root-offset)) (image (format 'disk-image) @@ -205,6 +213,11 @@ (define tarball-image-type (name 'tarball) (constructor (cut image-with-os tarball-image <>)))) +(define wsl-tarball-image-type + (image-type + (name 'wsl-tarball) + (constructor (cut image-with-os wsl-tarball-image <>)))) + (define raw-with-offset-image-type (image-type (name 'raw-with-offset) @@ -652,7 +665,8 @@ (define builder (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* ((shared-network? (image-shared-network? image)) @@ -661,7 +675,12 @@ (define* (system-tarball-image image (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 @@ -697,6 +716,15 @@ (define builder #:system-directory #$os) (with-directory-excursion image-root + (when #$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 @@ -718,7 +746,7 @@ (define (image->root-file-system image) "Return the IMAGE root partition file-system type." (case (image-format image) ((iso9660) "iso9660") - ((docker tarball) "dummy") + ((docker tarball wsl-tarball) "dummy") (else (partition-file-system (find-root-partition image))))) @@ -858,6 +886,8 @@ (define target (cond (system-docker-image image*)) ((memq image-format '(tarball)) (system-tarball-image image*)) + ((memq image-format '(wsl-tarball)) + (system-tarball-image image* #:wsl? #t)) ((memq image-format '(iso9660)) (system-iso9660-image image* -- 2.34.0 From patchwork Thu Feb 10 06:31:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 37161 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5057827BBEA; Thu, 10 Feb 2022 07:04:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB72127BBE9 for ; Thu, 10 Feb 2022 07:04:33 +0000 (GMT) Received: from localhost ([::1]:53240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nI3VI-00028B-RH for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 02:04:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nI2zq-0004c5-5Q for guix-patches@gnu.org; Thu, 10 Feb 2022 01:32:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nI2zp-0005Hw-QZ for guix-patches@gnu.org; Thu, 10 Feb 2022 01:32:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nI2zp-0003px-Lg for guix-patches@gnu.org; Thu, 10 Feb 2022 01:32:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53912] [PATCH 4/5] system: Add wsl module. References: <875ypndznv.fsf@ajgrf.com> In-Reply-To: <875ypndznv.fsf@ajgrf.com> Resent-From: Alex Griffin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 06:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53912@debbugs.gnu.org Received: via spool by 53912-submit@debbugs.gnu.org id=B53912.164447468614692 (code B ref 53912); Thu, 10 Feb 2022 06:32:01 +0000 Received: (at 53912) by debbugs.gnu.org; 10 Feb 2022 06:31:26 +0000 Received: from localhost ([127.0.0.1]:53442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2zF-0003ou-TB for submit@debbugs.gnu.org; Thu, 10 Feb 2022 01:31:26 -0500 Received: from mail-4323.proton.ch ([185.70.43.23]:55363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI2zC-0003oc-Kh for 53912@debbugs.gnu.org; Thu, 10 Feb 2022 01:31:24 -0500 Date: Thu, 10 Feb 2022 06:31:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; s=protonmail; t=1644474675; bh=XvdAMCaYsjZNyoZ6Nvzpn847QHT3tnNd6IkuAKYVdmY=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID; b=RwfkDn4ox9PJt5094zHkcpriWwUveKt0XaADzukO7BbbvPhyqGfZb718tyN8J9gCt tpWdiXHXN4EGypJQS2h52xfIdJWoxBAcY/90jkEKZ39dvRxilf6LEtQxHT2gTjC+H7 OvRxyYE4RW7N0izq/2Y2EqFMotdWfVo1H3RNpiT5J1Ubnk9tAu9Khd7HhlwhcNENvD ZSnjsW2tlTLMisBd/PSZ4LvAEOlRhT745DKIOAWEo43Gp1EHepbBMRe0n43AfGsJun /pa32KLQP3W1wE8dMy0Z2e1WyI2n83HcEFGsb1GhGeccCrMheeOXKGA6BJYgFiP2fk wucSL6rSKbJmg== Message-ID: <87v8xncjx4.fsf@ajgrf.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Alex Griffin X-ACL-Warn: , Alex Griffin via Guix-patches X-Patchwork-Original-From: Alex Griffin via Guix-patches via From: Alex Griffin X-getmail-retrieved-from-mailbox: Patches This patch adds a new module at gnu/system/wsl.scm. It contains a minimal operating-system definition that works in WSL. Thanks, – Alex Griffin From 55cbd67645fced42905b3bcff345116de7365049 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 9 Feb 2022 23:09:52 -0600 Subject: [PATCH 4/5] system: Add wsl module. * gnu/system/wsl.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 2 + gnu/system/wsl.scm | 148 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 gnu/system/wsl.scm diff --git a/gnu/local.mk b/gnu/local.mk index 198c8f64a6..fecde5b4dd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -49,6 +49,7 @@ # Copyright © 2021 Simon Tournier # Copyright © 2022 Daniel Meißner # Copyright © 2022 Remco van 't Veer +# Copyright © 2022 Alex Griffin # # This file is part of GNU Guix. # @@ -700,6 +701,7 @@ GNU_SYSTEM_MODULES = \ %D%/system/shadow.scm \ %D%/system/uuid.scm \ %D%/system/vm.scm \ + %D%/system/wsl.scm \ \ %D%/system/images/hurd.scm \ %D%/system/images/novena.scm \ diff --git a/gnu/system/wsl.scm b/gnu/system/wsl.scm new file mode 100644 index 0000000000..63c71926a7 --- /dev/null +++ b/gnu/system/wsl.scm @@ -0,0 +1,148 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Alex Griffin +;;; +;;; 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 wsl) + #:use-module (gnu bootloader) + #: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 shadow) + #:use-module (guix build-system trivial) + #:use-module (guix gexp) + #:use-module (guix packages) + #:export (wsl-boot-program + wsl-os)) + +(define (wsl-boot-program user) + "Program that runs the system boot script, then starts a login shell as USER." + (program-file + "wsl-boot-program" + #~(begin + (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")) + + ;; 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)) + #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")))))))) -- 2.34.0 From patchwork Thu Feb 10 06:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Griffin X-Patchwork-Id: 37160 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4BDE427BBEA; Thu, 10 Feb 2022 06:52:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0C76D27BBE9 for ; Thu, 10 Feb 2022 06:52:24 +0000 (GMT) Received: from localhost ([::1]:45508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nI3JW-0004TE-UN for patchwork@mira.cbaines.net; Thu, 10 Feb 2022 01:52:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nI33i-0000kn-1s for guix-patches@gnu.org; Thu, 10 Feb 2022 01:36:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nI33h-00062q-Os for guix-patches@gnu.org; Thu, 10 Feb 2022 01:36:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nI33h-0003xH-Nr for guix-patches@gnu.org; Thu, 10 Feb 2022 01:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53912] [PATCH 5/5] image: Add wsl image. References: <875ypndznv.fsf@ajgrf.com> In-Reply-To: <875ypndznv.fsf@ajgrf.com> Resent-From: Alex Griffin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Feb 2022 06:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53912 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53912@debbugs.gnu.org Received: via spool by 53912-submit@debbugs.gnu.org id=B53912.164447495915185 (code B ref 53912); Thu, 10 Feb 2022 06:36:01 +0000 Received: (at 53912) by debbugs.gnu.org; 10 Feb 2022 06:35:59 +0000 Received: from localhost ([127.0.0.1]:53452 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI33e-0003wq-Vy for submit@debbugs.gnu.org; Thu, 10 Feb 2022 01:35:59 -0500 Received: from mail-4317.proton.ch ([185.70.43.17]:24202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nI33c-0003wR-Er for 53912@debbugs.gnu.org; Thu, 10 Feb 2022 01:35:58 -0500 Date: Thu, 10 Feb 2022 06:35:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ajgrf.com; s=protonmail; t=1644474949; bh=9+MSnxsOao+njcPqpUV0J/3AYk4DWcwdkwlhqoHm3Go=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc:Date:Subject: Reply-To:Feedback-ID:Message-ID; b=g7qlCTjRTxVMLy0m4G24nPFqhtLVnSe+E9+HKG/AZsCChPZtEUuIjKQWmlQBwvYqM WG0Tg0JmUJSRidSsewGDqeyjpRl4lSibdm+l63qMGa9yNObm0WKvuMjNeXuL8MEKqW rLV2Y7QrY6JluDvQm7zeXT5HucGz2s444DCKT3GgXynU/83iJuaZkcsusdeOnMO7Pg o9meJeWrSd/eIp8mzBvjA5+joFIEL2pYKXPXRt65aPNVVHYXJoFOCH0feBjk95VJRv Bm4hvPF49iSlGJgN3XHzPKS5CPFaB+oMGx5i3UJwuuOKDMd9hVOLG+ePC1mNqBUKS6 Ec32L4fYd/EyA== Message-ID: <87tud7cjpg.fsf@ajgrf.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Alex Griffin X-ACL-Warn: , Alex Griffin via Guix-patches X-Patchwork-Original-From: Alex Griffin via Guix-patches via From: Alex Griffin X-getmail-retrieved-from-mailbox: Patches This patch adds the wsl system image. Generate it with guix system image gnu/system/images/wsl.scm Thanks, – Alex Griffin From 65f58dae36f25c4bcb64f4b75060a2635aab7fa2 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Wed, 9 Feb 2022 23:04:04 -0600 Subject: [PATCH 5/5] image: Add wsl image. * gnu/system/images/wsl.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/system/images/wsl.scm | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 gnu/system/images/wsl.scm diff --git a/gnu/local.mk b/gnu/local.mk index fecde5b4dd..41f0d14c42 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -708,6 +708,7 @@ GNU_SYSTEM_MODULES = \ %D%/system/images/pine64.scm \ %D%/system/images/pinebook-pro.scm \ %D%/system/images/rock64.scm \ + %D%/system/images/wsl.scm \ \ %D%/machine.scm \ \ diff --git a/gnu/system/images/wsl.scm b/gnu/system/images/wsl.scm new file mode 100644 index 0000000000..c4ad4a7c27 --- /dev/null +++ b/gnu/system/images/wsl.scm @@ -0,0 +1,31 @@ +;;; Copyright © 2022 Alex Griffin +;;; +;;; 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 wsl) + #:use-module (gnu image) + #:use-module (gnu system image) + #:use-module (gnu system wsl) + #:export (wsl-tarball-image)) + +(define wsl-tarball-image + (image + (inherit + (os->image wsl-os + #:type wsl-tarball-image-type)) + (name 'wsl-tarball-image))) + +wsl-tarball-image -- 2.34.0