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