From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id MLawDtQ3PGcghgAA62LTzQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 07:01:40 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp1.migadu.com with LMTPS
	id MLawDtQ3PGcghgAA62LTzQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:01:40 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=r2gcHP9R;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=oNAmV9GA;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1731999700;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=9JPDnrOqlmB6em+KLsZAHXaG8wxrH5HaNjiSGZjLXG4=;
	b=NpivecCbk+uJBHH9lO04sroRJrsNKEHM097ciQI12zjhxnP/tIvbhHgm1WZngsIkFkv1q3
	JsLDb5ymScVr2LsfJZpaho/c53MAujGLnpqifYU31Wu/EdJJnlIAtnmaQVqaEqnEzTIUhQ
	4CQW1+zipQfgMHF4itCOiEb+ARPh3/uZdrCGK1GBEZP76S5RYD0tqzaKOLuiDC7H9J6gXT
	QuqqgxR9sh6Tx7+5l5iaM4hn3XuYpclB3ZOdIotzUihF3fzDT9onorlbJjXn4XA8DipAT6
	cZ/rTTUWiYuJX1QLgqfQijgnVPn4vfEDTkitDNXKx9GRgkJmJdU3r0sr32D3lw==
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1731999700; a=rsa-sha256; cv=none;
	b=pmr4sBR6V2zguP8KHblwbqPQj5SlcpNJZEi4cXXD8O/Y5yBQvHkIDEJtrFpM4nyHh+z1tp
	0sL5Lu69wOtWqV/ePPTa0T7NsC/enMOh9RfvySCrDY76Csf6NEcGKzykSjJr6qWZUxWZmm
	bF9mmlKrMHwHwXohrAR8UmNgIg7VwDxElNUq3aueraRP+1FMEMmfM5eHzxO6IqLvJaQKRV
	VWFQyRhSGIUPwyIR1VKQCa2T/bKWyJTPWukiCUN1He9eZSfL/5KtWqHySwXUVBHg7KlWMf
	d54oCmlmgc+eIXTElhjOynbLfeGIbZIr71kVlGCpDtHFZC1aZrrPWjKs0cs6Kg==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=r2gcHP9R;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=oNAmV9GA;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org";
	dmarc=pass (policy=none) header.from=gnu.org
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id F239A79B8E
	for <larch@yhetil.org>; Tue, 19 Nov 2024 08:01:39 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tDIDo-00017i-R4; Tue, 19 Nov 2024 02:00:24 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tDIDb-0000pe-2v
 for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:11 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tDIDa-0004lo-LF
 for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:10 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:References:In-Reply-To:Date:From:To:Subject;
 bh=9JPDnrOqlmB6em+KLsZAHXaG8wxrH5HaNjiSGZjLXG4=; 
 b=r2gcHP9RAGfvZYm8VW94fjoxMaBcE219hfeBwP4GTwvb75EGA5GLkEw3oi4eZSJl1J/0K634QsDVg+uRazAUu+dw50r/9OBjJSRqzkXOz4+VQPIHBVtnA+K9Mc8HVjQ/CPyvTQf/3MQDSEhiBesfOjHz/+4C5aawtKRWyZTZB0Nk6l4D7+uVJltpQ1fzpYq5zBKPKkPG+JyLRj4RSSL/SvRujHWEwgN3QOXBIha2LBrvt706+gUZlslfAvz65YgWOIHFfEt+gNDEAYGLL3ddJEN/xJ6brxV5Y7+a1GMdk2rxTOMBVj3juR6foL07sOqHOEwkEMZbpmK6MpLEyYtIkg==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tDIDa-0005Pw-GM
 for guix-patches@gnu.org; Tue, 19 Nov 2024 02:00:10 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v3 49/51] system: examples: Add bare-hurd64.tmpl.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 19 Nov 2024 07:00:10 +0000
Resent-Message-ID: <handler.74290.B74290.173199959620646@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 74290
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74290@debbugs.gnu.org
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173199959620646
 (code B ref 74290); Tue, 19 Nov 2024 07:00:10 +0000
Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:59:56 +0000
Received: from localhost ([127.0.0.1]:40675 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tDIDL-0005Mo-Hy
 for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:56 -0500
Received: from eggs.gnu.org ([209.51.188.92]:43512)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tDICU-0005Cn-DG
 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:59:04 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <janneke@gnu.org>)
 id 1tDIAI-00047Y-32; Tue, 19 Nov 2024 01:56:46 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=9JPDnrOqlmB6em+KLsZAHXaG8wxrH5HaNjiSGZjLXG4=; b=oNAmV9GAPRGU31zfGj/G
 bh2HdkJnuAq5ZglJLwPTbMBMd4G6moqpdt5wjJBZ7G5WIe52dPK7OX2p6oUFOY5xnEBWMhvoRLZe0
 2ibQUkApTNkZqD4iK5ugVg85xsiGuXdzUD8gz6Z6DOsAIxwTSjJViDO9PaEULCTgsFK3e1PLN4vEY
 ddbGFdEAdisGcuHBcmykfXKKyTBreRh+4VJUDUuWGBbD6rLDDZdmmqn3oxrdMIsyIAYm64Nq9+FfO
 x9ImRwrVO1OhL5P3dBTYTg3ssec4F47k9Ed1cp6Q2F2ZNIb0qeTIq+89AlenF/ABbhIr75GDak6GG
 8136QYFJbHogaw==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 19 Nov 2024 07:55:19 +0100
Message-ID: <4d02e4ec4161b1a85150e942f2d8ee260b3961da.1731999203.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731999202.git.janneke@gnu.org>
References: <cover.1731999202.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -6.03
X-Spam-Score: -6.03
X-Migadu-Queue-Id: F239A79B8E
X-Migadu-Scanner: mx13.migadu.com
X-TUID: +lPcUnUNoGD3

* gnu/system/examples/bare-hurd.tmpl: Update comments.
* gnu/system/examples/bare-hurd64.tmpl: New file.

Change-Id: I8d26afd19afaa8fb3558948b50b0efdc0f83f29c
---
 gnu/system/examples/bare-hurd.tmpl   | 21 +++++----
 gnu/system/examples/bare-hurd64.tmpl | 70 ++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 9 deletions(-)
 create mode 100644 gnu/system/examples/bare-hurd64.tmpl

diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl
index 68c6d3c166..9bfa776769 100644
--- a/gnu/system/examples/bare-hurd.tmpl
+++ b/gnu/system/examples/bare-hurd.tmpl
@@ -3,23 +3,26 @@
 ;; This is an operating system configuration template
 ;; for a "bare bones" QEMU setup, with no X11 display server.
 
-;; To build a disk image for a virtual machine, do
+;; To build a disk image for a virtual machine, do:
 ;;
-;;     ./pre-inst-env guix system image --image-type=hurd-raw \
+;;     ./pre-inst-env guix system image --image-type=hurd-qcow2 \
 ;;         gnu/system/examples/bare-hurd.tmpl
 ;;
-;; You may run it like so
+;; You may run it like so:
 ;;
-;;     guix shell qemu -- qemu-system-i386 -enable-kvm -m 2048 \
-;;      -device rtl8139,netdev=net0 -netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222 \
-;;      -snapshot -hda <the-image>
+;;     guix shell qemu -- qemu-system-i386 -m 2048                \
+;;       --enable-kvm                                             \
+;;       --device e1000,netdev=net0                               \
+;;       --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222  \
+;;       --snapshot
+;;       --hda /gnu/store/...-disk-image
 ;;
-;; and use it like
+;; and use it like:
 ;;
 ;;     ssh -p 10022 root@localhost
 ;;     guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)'
 ;;
-;; or even (if you use --image-size=3G)
+;; or even, if you build the image with at least --image-size=3G:
 ;;
 ;;     guix build hello
 
@@ -34,7 +37,7 @@
                  (bootloader grub-minimal-bootloader)
                  (targets '("/dev/sdX"))))
     (file-systems (cons (file-system
-                          (device (file-system-label "my-root"))
+                          (device (file-system-label "hurd"))
                           (mount-point "/")
                           (type "ext2"))
                         %base-file-systems))
diff --git a/gnu/system/examples/bare-hurd64.tmpl b/gnu/system/examples/bare-hurd64.tmpl
new file mode 100644
index 0000000000..89811e458a
--- /dev/null
+++ b/gnu/system/examples/bare-hurd64.tmpl
@@ -0,0 +1,70 @@
+;; -*-scheme-*-
+
+;; This is an operating system configuration template
+;; for a "bare bones" QEMU setup, with no X11 display server.
+
+;; To build a disk image for a virtual machine, do:
+;;
+;;     ./pre-inst-env guix system image --image-type=hurd64-qcow2 \
+;;         gnu/system/examples/bare-hurd64.tmpl
+;;
+;; You may run it like so:
+;;
+;;     guix shell qemu@7 -- qemu-system-x86_64 -m 2048            \
+;;       --machine q35                                            \
+;;       --enable-kvm                                             \
+;;       --device e1000,netdev=net0                               \
+;;       --netdev user,id=net0,hostfwd=tcp:127.0.0.1:10022-:2222  \
+;;       --snapshot
+;;       --hda /gnu/store/...-disk-image
+;;
+;; and use it like:
+;;
+;;     ssh -p 10022 root@localhost
+;;     guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)'
+;;
+;; or even, if you build the image with at least --image-size=3G:
+;;
+;;     guix build hello
+
+(use-modules (gnu) (gnu system hurd) (guix utils))
+(use-service-modules ssh)
+(use-package-modules ssh)
+
+(define %hurd64-os
+  (operating-system
+    (inherit %hurd64-default-operating-system)
+    (bootloader (bootloader-configuration
+                 (bootloader grub-minimal-bootloader)
+                 (targets '("/dev/sdX"))))
+    (kernel-arguments '("noide")) ;use rumpdisk
+    (file-systems (cons (file-system
+                          (device (file-system-label "hurd"))
+                          (mount-point "/")
+                          (type "ext2"))
+                        %base-file-systems))
+    (host-name "guixygnu64")
+    (timezone "Europe/Amsterdam")
+    (users (cons (user-account
+                  (name "guix")
+                  (comment "Anonymous Hurd Hacker")
+                  (group "users")
+                  (supplementary-groups '("wheel")))
+                 %base-user-accounts))
+    (packages (cons openssh-sans-x %base-packages/hurd))
+    (services (cons (service openssh-service-type
+                             (openssh-configuration
+                              (openssh openssh-sans-x)
+                              (port-number 2222)
+                              (permit-root-login #t)
+                              (allow-empty-passwords? #t)
+                              (password-authentication? #t)))
+                    ;; For installing on a real (non-QEMU) machine, use:
+                    ;; (static-networking-service-type
+                    ;;   (list %loopback-static-networking
+                    ;;        (static-networking
+                    ;;         ...)))
+                    ;; %base-services/hurd
+                    %base-services+qemu-networking/hurd))))
+
+%hurd64-os
-- 
2.46.0