summaryrefslogtreecommitdiff
path: root/gnu/system/examples
diff options
context:
space:
mode:
authorJanneke Nieuwenhuizen <janneke@gnu.org>2024-10-20 19:37:25 +0200
committerJan (janneke) Nieuwenhuizen <janneke@gnu.org>2024-11-11 07:28:33 +0100
commit6dbfe1a118dcded3a9d77f8321aa43fbdd255011 (patch)
treed1215abdd57b95bab7e022ab661249467846cfb0 /gnu/system/examples
parentfdb23d9db8ca5431e280366c5c834e01eda62a5f (diff)
system: hurd: Remove qemu networking from %base-services/hurd.
This allows us to use %base-services/hurd for services in a Hurd config for a real machine without removing static-networking. * gnu/system/hurd.scm (%base-services/hurd): Factor networking out to... (%base-services+qemu-networking/hurd): ..this new variable. * gnu/system/examples/bare-hurd.tmpl (%hurd-os): Use it. * gnu/services/virtualization.scm (%hurd-vm-operating-system): Use it. * gnu/system/images/hurd.scm (hurd-barebones-os): Use it. Add comment about QEMU and networking for a real machine. Change-Id: I777a63410383b9bf8b5740e4513dbc1e9fb0fd41
Diffstat (limited to 'gnu/system/examples')
-rw-r--r--gnu/system/examples/bare-hurd.tmpl10
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/system/examples/bare-hurd.tmpl b/gnu/system/examples/bare-hurd.tmpl
index 463c7ee7987..68c6d3c1665 100644
--- a/gnu/system/examples/bare-hurd.tmpl
+++ b/gnu/system/examples/bare-hurd.tmpl
@@ -1,7 +1,7 @@
1;; -*-scheme-*- 1;; -*-scheme-*-
2 2
3;; This is an operating system configuration template 3;; This is an operating system configuration template
4;; for a "bare bones" setup, with no X11 display server. 4;; for a "bare bones" QEMU setup, with no X11 display server.
5 5
6;; To build a disk image for a virtual machine, do 6;; To build a disk image for a virtual machine, do
7;; 7;;
@@ -54,6 +54,12 @@
54 (permit-root-login #t) 54 (permit-root-login #t)
55 (allow-empty-passwords? #t) 55 (allow-empty-passwords? #t)
56 (password-authentication? #t))) 56 (password-authentication? #t)))
57 %base-services/hurd)))) 57 ;; For installing on a real (non-QEMU) machine, use:
58 ;; (static-networking-service-type
59 ;; (list %loopback-static-networking
60 ;; (static-networking
61 ;; ...)))
62 ;; %base-services/hurd
63 %base-services+qemu-networking/hurd))))
58 64
59%hurd-os 65%hurd-os