branch wip-hurd-vm updated: Revert "DRAFT system: examples: Add bare-hurd.tmpl."

[guix-commits]

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/wip-hurd-vm by this push:
     new b701f69  Revert "DRAFT system: examples: Add bare-hurd.tmpl."
b701f69 is described below

commit b701f69b3dccb3853fa47780b6c57825aa5a1f82
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Thu Apr 30 00:50:34 2020 +0200

    Revert "DRAFT system: examples: Add bare-hurd.tmpl."
    
    This reverts commit fdb35e387bea96c6a80526c712977d1fbdf931c4.
---
 Makefile.am                        |  1 -
 gnu/system.scm                     |  6 ++++--
 gnu/system/examples/bare-hurd.tmpl | 29 -----------------------------
 gnu/system/hurd.scm                | 32 +++++++++-----------------------
 4 files changed, 13 insertions(+), 55 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 869f32b..bb243fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -343,7 +343,6 @@ 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.scm b/gnu/system.scm
index d20c83e..60dc882 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -519,8 +519,10 @@ value of the SYSTEM-SERVICE-TYPE service."
 (define* (hurd-operating-system-directory-base-entries os)
   "Return the basic entries of the 'system' directory of OS for use as the
 value of the SYSTEM-SERVICE-TYPE service."
-  (mlet* %store-monad ()
-    (return `())))
+  (let ((locale (operating-system-locale-directory os)))
+    (mlet* %store-monad ((kernel -> (operating-system-kernel os)))
+      (return `(("kernel" ,kernel)
+                ("locale" ,locale))))))
 
 (define (operating-system-default-essential-services os)
   "Return the list of essential services for OS.  These are special services
diff --git a/gnu/system/examples/bare-hurd.tmpl 
b/gnu/system/examples/bare-hurd.tmpl
deleted file mode 100644
index 263ad53..0000000
--- a/gnu/system/examples/bare-hurd.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-;; -*-scheme-*-
-
-;; This is an operating system configuration template
-;; for a "bare bones" setup, with no X11 display server.
-
-(use-modules (gnu) (gnu system hurd))
-(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")))
-    (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 aa29faf..0054c77 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -104,15 +104,15 @@
 
 (define* (hurd-grub-configuration-file config entries
                                        #:key
-                                       (system "i586-pc-gnu")
+                                       (system (%current-system))
                                        (old-entries '()))
-  (let ((hurd (if (equal? (%current-system) "i586-pc-gnu")
+  (let ((hurd (if (equal? system (%current-system))
                   hurd
                   (with-parameters ((%current-target-system system))
                     hurd)))
         (mach (with-parameters ((%current-system "i686-linux"))
                 gnumach))
-        (libc (if (equal? system "i586-pc-gnu")
+        (libc (if (equal? system (%current-system))
                   glibc
                   (cross-libc system))))
     (computed-file "grub.cfg"
@@ -142,30 +142,15 @@ menuentry \"GNU\" {
 
 (define %hurd-default-operating-system
   (operating-system
-    (kernel hurd)
-    ;; (kernel-loadable-modules '())
-    (kernel-arguments '())
+    (host-name "guixygnu")
     (bootloader (bootloader-configuration
                  (bootloader hurd-grub-minimal-bootloader)
                  (target "/dev/vda")))
-    (label (lambda _ "label"))
-    (initrd (lambda _ '()))
-    (initrd-modules (lambda _ '()))
-    (firmware '())
-    (host-name "guixygnu")
-    ;; (hosts-file #F)
-    ;; (mapped-devices '())
+    (kernel hurd)
+    (initrd-modules '())
     (file-systems '())
-    ;; (swap-devices '())
-    (users '())
-    ;(groups '())
-    (skeletons '())
-    ;; (issue %default-issue)
-    (packages %base-packages/hurd)
+    (swap-devices '())
     (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
@@ -177,9 +162,10 @@ menuentry \"GNU\" {
                               (allow-empty-passwords? #t)
                               (password-authentication? #t)))
                     %base-services/hurd))
+    (packages %base-packages/hurd)
     (pam-services '())
     (setuid-programs '())
-    (sudoers-file #f)))
+    (users '())))
 
 (define (input->packages input)
   "Return the list of packages in INPUT."