From e11e59cbcd9165e3b885c1019e19aaab471f5498 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 30 Apr 2020 15:40:07 +0200 Subject: [PATCH] gnu: services: Add %hurd-startup-service. This decouples startup of the Hurd from the "hurd" package, moving the RC script into SYSTEM. * gnu/packages/hurd.scm (hurd)[inputs]: Remove hurd-rc-script. [arguments]: Do not substitute it. Update "runsystem.sh" to parse kernel arguments and exec into --rc-file=RC-FILE. (hurd-rc-script): Move to... * gnu/services.scm (%hurd-rc-file): ...this new variable. (bootable-kernel-arguments): Use it. (%hurd-bare-metal-service): New variable. * gnu/system.scm (hurd-default-essential-services): Use it. --- gnu/packages/hurd.scm | 52 ++++++++++--------------------------------- gnu/services.scm | 40 +++++++++++++++++++++++++++++++++ gnu/system.scm | 21 ++++++++++------- 3 files changed, 65 insertions(+), 48 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 5de4acb1c5..542ca1e229 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -310,32 +310,6 @@ Hurd-minimal package which are needed for both glibc and GCC.") (base32 "0p2vhnc18cnbmb39vq4m7hzv4mhnm2l0a2s7gx3ar277fwng3hys")))) -(define (hurd-rc-script) - "Return a script to be installed as /libexec/rc in the 'hurd' package. The -script takes care of installing the relevant passive translators on the first -boot, since this cannot be done from GNU/Linux. Then, it runs system -activation; starting the Shepherd." - - (define rc - (with-imported-modules '((guix build utils) - (gnu build hurd-boot) - (guix build syscalls)) - #~(begin - (use-modules (guix build utils) - (gnu build hurd-boot) - (guix build syscalls) - (ice-9 match) - (system repl repl) - (srfi srfi-1) - (srfi srfi-26)) - - (boot-hurd-system)))) - - ;; FIXME: We want the program to use the cross-compiled Guile when - ;; cross-compiling. But why do we need to be explicit here? - (with-parameters ((%current-target-system "i586-pc-gnu")) - (program-file "rc" rc))) - (define dde-sources ;; This is the current tip of the dde branch (let ((commit "ac1c7eb7a8b24b7469bed5365be38a968d59a136")) @@ -417,11 +391,19 @@ PATH=@PATH@ fsck --yes --force / fsysopts / --writable settrans -c /servers/socket/1 /hurd/pflocal -echo Starting /libexec/rc ... -exec /libexec/rc \"$@\" -"))) - )) +# parse multiboot arguments +for i in \"$@\"; do + case $i in + (--rc-file=*) + rc=${i#--rc-file=} + ;; + esac +done + +echo Starting ${rc}... +exec ${rc} \"$@\" +"))))) (add-before 'build 'set-file-names (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -483,15 +465,6 @@ exec /libexec/rc \"$@\" (mkdir-p datadir) (copy-file "unifont" (string-append datadir "/vga-system.bdf")) - #t))) - (add-after 'install 'install-rc-file - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/libexec/rc")) - (rc (assoc-ref inputs "hurd-rc")) - (coreutils (assoc-ref inputs "coreutils"))) - (delete-file file) - (copy-file rc file) #t)))) #:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") @@ -506,7 +479,6 @@ exec /libexec/rc \"$@\" (build-system gnu-build-system) (inputs `(("glibc-hurd-headers" ,glibc/hurd-headers) - ("hurd-rc" ,(hurd-rc-script)) ("libgcrypt" ,libgcrypt) ;for /hurd/random ("libdaemon" ,libdaemon) ;for /bin/console --daemonize diff --git a/gnu/services.scm b/gnu/services.scm index 4e0bbc0249..b21520eafc 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -94,6 +94,8 @@ activation-service-type activation-service->script %linux-bare-metal-service + %hurd-rc-script + %hurd-startup-service special-files-service-type extra-special-file etc-service-type @@ -630,6 +632,44 @@ ACTIVATION-SCRIPT-TYPE." activation-service-type %linux-kernel-activation)) +;; XXX this won't go into SYSTEM (as system-service); the result is fine +;; though and it gets picked-up well by --rc-file=%hurd-rc-script +(define %hurd-rc-script + ;; The RC script to be started upon boot. + (program-file "rc" + (with-imported-modules '((guix build utils) + (gnu build hurd-boot) + (guix build syscalls)) + #~(begin + (use-modules (guix build utils) + (gnu build hurd-boot) + (guix build syscalls) + (ice-9 match) + (system repl repl) + (srfi srfi-1) + (srfi srfi-26)) + (boot-hurd-system))))) + +(define (hurd-rc-entry mrc) + "Return, as a monadic value, an entry for the RC script in the system +directory." + (mlet %store-monad ((rc mrc)) + (return `(("rc" ,rc))))) + +(define hurd-startup-service-type + ;; The service that creates the initial RC startup file. + (service-type (name 'startup) + (extensions + (list (service-extension system-service-type hurd-rc-entry))) + (compose identity) + (extend (const (lower-object %hurd-rc-script))) + (description + "Produce the operating system's RC script, which is executed +by RUNSYSTEM."))) + +(define %hurd-startup-service + ;; The service that produces the RC script. + (service hurd-startup-service-type #t)) (define special-files-service-type ;; Service to install "special files" such as /bin/sh and /usr/bin/env. diff --git a/gnu/system.scm b/gnu/system.scm index 41c551af0b..09ab574278 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -170,14 +170,18 @@ (define (bootable-kernel-arguments system root-device) "Return a list of kernel arguments (gexps) to boot SYSTEM from ROOT-DEVICE." - (list (string-append "--root=" - ;; Note: Always use the DCE format because that's what - ;; (gnu build linux-boot) expects for the '--root' - ;; kernel command-line option. - (file-system-device->string root-device - #:uuid-type 'dce)) - #~(string-append "--system=" #$system) - #~(string-append "--load=" #$system "/boot"))) + (append + (if (hurd-target?) + (list #~(string-append "--rc-file=" #$%hurd-rc-script)) + '()) + (list (string-append "--root=" + ;; Note: Always use the DCE format because that's what + ;; (gnu build linux-boot) expects for the '--root' + ;; kernel command-line option. + (file-system-device->string root-device + #:uuid-type 'dce)) + #~(string-append "--system=" #$system) + #~(string-append "--load=" #$system "/boot")))) ;; System-wide configuration. ;; TODO: Add per-field docstrings/stexi. @@ -610,6 +614,7 @@ bookkeeping." (define (hurd-default-essential-services os) (list (service system-service-type '()) %boot-service + %hurd-startup-service %activation-service %shepherd-root-service (service user-processes-service-type) -- 2.26.2