[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/16: system: Add `hurd-activation'.
From: |
guix-commits |
Subject: |
15/16: system: Add `hurd-activation'. |
Date: |
Thu, 14 May 2020 17:32:12 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 274c62af26690c9ca09b30f32a1235ad64da41e4
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun May 3 16:32:09 2020 +0200
system: Add `hurd-activation'.
* gnu/system.scm (gnu/linux-activation-script): Rename from
activation-script.
(activation-script, hurd-activation-script): New procedure.
---
gnu/services.scm | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 40 insertions(+), 15 deletions(-)
diff --git a/gnu/services.scm b/gnu/services.scm
index 614956f..f161635 100644
--- a/gnu/services.scm
+++ b/gnu/services.scm
@@ -519,6 +519,43 @@ ACTIVATION-SCRIPT-TYPE."
(define (activation-script gexps)
"Return the system's activation script, which evaluates GEXPS."
+ (program-file "activate.scm" (if (hurd-target?)
+ (hurd-activation-script gexps)
+ (gnu/linux-activation-script gexps))))
+
+(define (gnu/linux-activation-script gexps)
+ "Return a GNU/Linux system activation script, which evaluates GEXPS."
+
+ (define actions
+ (map (cut program-file "activate-service.scm" <>) gexps))
+
+ (with-imported-modules (source-module-closure
+ '((gnu build activation)
+ (guix build utils)))
+ #~(begin
+ (use-modules (gnu build activation)
+ (guix build utils))
+
+ ;; Make sure the user accounting database exists. If it
+ ;; does not exist, 'setutxent' does not create it and
+ ;; thus there is no accounting at all.
+ (close-port (open-file "/var/run/utmpx" "a0"))
+
+ ;; Same for 'wtmp', which is populated by mingetty et
+ ;; al.
+ (close-port (open-file "/var/log/wtmp" "a0"))
+
+ ;; Set up /run/current-system. Among other things this
+ ;; sets up locales, which the activation snippets
+ ;; executed below may expect.
+ (activate-current-system)
+
+ ;; Run the services' activation snippets.
+ ;; TODO: Use 'load-compiled'.
+ (for-each primitive-load '#$actions))))
+
+(define (hurd-activation-script gexps)
+ "Return the Hurd activation script, which evaluates GEXPS."
(define actions
(map (cut program-file "activate-service.scm" <>) gexps))
@@ -530,23 +567,11 @@ ACTIVATION-SCRIPT-TYPE."
(use-modules (gnu build activation)
(guix build utils))
- ;; Make sure the user accounting database exists. If it
- ;; does not exist, 'setutxent' does not create it and
- ;; thus there is no accounting at all.
- (close-port (open-file "/var/run/utmpx" "a0"))
-
- ;; Same for 'wtmp', which is populated by mingetty et
- ;; al.
+ (mkdir-p "/var/run") ;for the PID files
(mkdir-p "/var/log")
- (close-port (open-file "/var/log/wtmp" "a0"))
-
- ;; Set up /run/current-system. Among other things this
- ;; sets up locales, which the activation snippets
- ;; executed below may expect.
- (activate-current-system)
- ;; Run the services' activation snippets.
- ;; TODO: Use 'load-compiled'.
+ ;; XXX TODO
+ ;; (activate-hurd-system)
(for-each primitive-load '#$actions)))))
(define (gexps->activation-gexp gexps)
- branch wip-hurd-vm created (now 23cfcb3), guix-commits, 2020/05/14
- 02/16: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/14
- 01/16: gnu: linux-libre: Add support for gnu.* namespace., guix-commits, 2020/05/14
- 06/16: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/14
- 07/16: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/14
- 09/16: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/14
- 08/16: bootleader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/14
- 13/16: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/14
- 15/16: system: Add `hurd-activation'.,
guix-commits <=
- 16/16: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/14
- 03/16: syscalls: Adjust 'sockaddr-in', 'sockaddr-in6' structs for the Hurd., guix-commits, 2020/05/14
- 12/16: system: Use 'hurd' package in label., guix-commits, 2020/05/14
- 14/16: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/14
- 04/16: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/14
- 05/16: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/14
- 10/16: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/14
- 11/16: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/14