[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/67: hurd-boot: Support system init: Create essential device nodes.
From: |
guix-commits |
Subject: |
19/67: hurd-boot: Support system init: Create essential device nodes. |
Date: |
Tue, 18 Jul 2023 10:16:02 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit e462036c0c638b2e2fd60c7b6310da55cb215d45
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue May 30 18:07:17 2023 +0200
hurd-boot: Support system init: Create essential device nodes.
* gnu/build/hurd-boot.scm (make-hurd-device-nodes): Cater for existing
directories (dev, servers).
(set-hurd-device-translators): Remove /servers/socket/1, that is created by
libexec/console-run. Cater for nonexistent /dev/console.
(boot-hurd-system): Call make-hurd-device-nodes on initial run.
---
gnu/build/hurd-boot.scm | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index 19bdbdf6ae..bd19fd5212 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -79,13 +79,13 @@ Return the value associated with OPTION, or #f on failure."
(define (scope dir)
(string-append root (if (string-suffix? "/" root) "" "/") dir))
- (mkdir (scope "dev"))
+ (mkdir-p (scope "dev"))
;; Don't create /dev/null etc just yet; the store
;; messes-up the permission bits.
;; Don't create /dev/console, /dev/vcs, etc.: they are created by
;; console-run on first boot.
- (mkdir (scope "servers"))
+ (mkdir-p (scope "servers"))
(for-each (lambda (file)
(call-with-output-file (scope (string-append "servers/" file))
(lambda (port)
@@ -100,7 +100,8 @@ Return the value associated with OPTION, or #f on failure."
"kill"
"suspend"))
- (mkdir (scope "servers/socket"))
+ (mkdir-p (scope "servers/socket"))
+
;; Don't create /servers/socket/1 & co: runsystem does that on first boot.
;; TODO: Set the 'gnu.translator' extended attribute for passive translator
@@ -266,7 +267,8 @@ set."
(for-each scope-set-translator servers)
(mkdir* "dev/vcs/1")
(mkdir* "dev/vcs/2")
- (rename-file (scope "dev/console") (scope "dev/console-"))
+ (when (file-exists? (scope "dev/console"))
+ (rename-file (scope "dev/console") (scope "dev/console-")))
(for-each scope-set-translator devices)
(false-if-EEXIST (symlink "/dev/random" (scope "dev/urandom")))
@@ -313,6 +315,10 @@ XXX TODO: use Linux xattr/setxattr to remove (settrans in)
/libexec/RUNSYSTEM
(let ((hurd/hurd (readlink* (string-append system "/profile/hurd"))))
(symlink hurd/hurd "/hurd"))
+ (unless (file-exists? "/servers/startup")
+ (format #t "Creating essential device nodes...\n")
+ (make-hurd-device-nodes))
+
(format #t "Setting-up essential translators...\n")
(setenv "PATH" (string-append system "/profile/bin"))
(set-hurd-device-translators)
- 09/67: Revert "gnu: libunistring: Fix make check for the Hurd.", (continued)
- 09/67: Revert "gnu: libunistring: Fix make check for the Hurd.", guix-commits, 2023/07/18
- 12/67: gnu: grep: Update hanging and failing tests on the Hurd., guix-commits, 2023/07/18
- 02/67: gnu: commencement: Add automake-boot0., guix-commits, 2023/07/18
- 39/67: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/18
- 40/67: gnu: swig: Skip tests when building for the Hurd., guix-commits, 2023/07/18
- 33/67: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/18
- 15/67: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/07/18
- 13/67: Revert "gnu: sed: Skip failing test on GNU/Hurd.", guix-commits, 2023/07/18
- 07/67: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/07/18
- 17/67: gnu: m4: Skip gnulib stack-overflow tests for the Hurd., guix-commits, 2023/07/18
- 19/67: hurd-boot: Support system init: Create essential device nodes.,
guix-commits <=
- 21/67: gnu: python: Support native build on the Hurd., guix-commits, 2023/07/18
- 22/67: gnu: mpfr: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 28/67: gnu: tcl: Remove failing tests on the Hurd.., guix-commits, 2023/07/18
- 24/67: gnu: libbsd: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 30/67: gnu: git: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 31/67: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/07/18
- 26/67: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/07/18
- 06/67: gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216., guix-commits, 2023/07/18
- 53/67: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/07/18
- 44/67: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/18