32/36: DRAFT system: examples: Add bare-hurd.tmpl.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 8d01114f2279e6e3de82addfb79d2b39f84dd6a9
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Thu Apr 30 07:33:16 2020 +0200

    DRAFT system: examples: Add bare-hurd.tmpl.
    
    XXX This does not work yet.  Start of migration from
    
        ./pre-inst-env guix build -f gnu/system/hurd.scm  # This works!
    
    to
    
        ./pre-inst-env guix system vm-image --target=i586-pc-gnu 
gnu/system/examples/bare-hurd.tmpl
    
    See also: <https://bugs.gnu.org/40839>; wip-disk-image.
    
    * gnu/system/hurd.scm (hurd-grub-configuration-file): Add empty firmware, 
initrd.
    Use lambda to empty initrd-modules proprely.
    * gnu/system/examples/bare-hurd.tmpl: New file.
    * Makefile.am (EXAMPLES): Add it.
    
    squash! DRAFT system: examples: Add bare-hurd.tmpl.
---
 Makefile.am                        |  1 +
 gnu/system/examples/bare-hurd.tmpl | 34 ++++++++++++++++++++++++++++++++++
 gnu/system/hurd.scm                | 26 ++++++++++++++++++++------
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bb243fe..869f32b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -343,6 +343,7 @@ AUX_FILES =                                         \
 EXAMPLES =                                     \
   gnu/system/examples/asus-c201.tmpl           \
   gnu/system/examples/bare-bones.tmpl          \
+  gnu/system/examples/bare-hurd.tmpl           \
   gnu/system/examples/beaglebone-black.tmpl    \
   gnu/system/examples/desktop.tmpl             \
   gnu/system/examples/lightweight-desktop.tmpl \
diff --git a/gnu/system/examples/bare-hurd.tmpl 
b/gnu/system/examples/bare-hurd.tmpl
new file mode 100644
index 0000000..aabdd61
--- /dev/null
+++ b/gnu/system/examples/bare-hurd.tmpl
@@ -0,0 +1,34 @@
+;; -*-scheme-*-
+
+;; This is an operating system configuration template
+;; for a "bare bones" setup, with no X11 display server.
+
+(use-modules (gnu) (gnu system hurd) (guix utils))
+(use-service-modules hurd ssh)
+(use-package-modules ssh)
+
+(define %hurd-os
+  (operating-system
+    (inherit %hurd-default-operating-system)
+    (bootloader (bootloader-configuration
+                 (bootloader hurd-grub-minimal-bootloader)
+                 (target "/dev/sdX")))
+    (file-systems (cons (file-system
+                          (device (file-system-label "my-root"))
+                          (mount-point "/")
+                          (type "ext2"))
+                        %base-file-systems))
+    (host-name "guixygnu")
+    (timezone "GNUrope")
+    (packages %base-packages/hurd)
+    (services (cons (service openssh-service-type
+                             (openssh-configuration
+                              (use-pam? #f)
+                              (openssh openssh)
+                              (port-number 2222)
+                              (permit-root-login #t)
+                              (allow-empty-passwords? #t)
+                              (password-authentication? #t)))
+                    %base-services/hurd))))
+
+%hurd-os
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index fb6983a..e7fcdbd 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -142,15 +142,30 @@ menuentry \"GNU\" {
 
 (define %hurd-default-operating-system
   (operating-system
-    (host-name "guixygnu")
+    (kernel hurd)
+    ;; (kernel-loadable-modules '())
+    (kernel-arguments '())
     (bootloader (bootloader-configuration
                  (bootloader hurd-grub-minimal-bootloader)
                  (target "/dev/vda")))
-    (kernel hurd)
-    (initrd-modules '())
+    (label (lambda _ "label"))
+    (initrd (lambda _ '()))
+    (initrd-modules (lambda _ '()))
+    (firmware '())
+    (host-name "guixygnu")
+    ;; (hosts-file #F)
+    ;; (mapped-devices '())
     (file-systems '())
-    (swap-devices '())
+    ;; (swap-devices '())
+    (users '())
+    ;(groups '())
+    (skeletons '())
+    ;; (issue %default-issue)
+    (packages %base-packages/hurd)
     (timezone "GNUrope")
+    ;; (locale "en_US.utf8")
+    (locale-definitions '())
+    ;; (locale-libcs '())
     (name-service-switch #f)
     (essential-services (hurd-default-essential-services 
this-operating-system))
     (services (cons (service openssh-service-type
@@ -162,10 +177,9 @@ menuentry \"GNU\" {
                               (allow-empty-passwords? #t)
                               (password-authentication? #t)))
                     %base-services/hurd))
-    (packages %base-packages/hurd)
     (pam-services '())
     (setuid-programs '())
-    (users '())))
+    (sudoers-file #f)))
 
 (define (input->packages input)
   "Return the list of packages in INPUT."