[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: hurd-boot: Support system init: Create essential device nodes.
From: |
guix-commits |
Subject: |
02/10: hurd-boot: Support system init: Create essential device nodes. |
Date: |
Sat, 20 Jan 2024 04:33:04 -0500 (EST) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 0d5e65341c7690c104e7cfee16d2c8dd5013369d
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 4407284acb..daf4fb41ab 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
@@ -279,7 +280,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")))
@@ -326,6 +328,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)
- branch hurd-team created (now 88371d570b), guix-commits, 2024/01/20
- 01/10: hurd: Support system init in /libexec/runsystem., guix-commits, 2024/01/20
- 03/10: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2024/01/20
- 04/10: DRAFT hurd: Support second boot., guix-commits, 2024/01/20
- 09/10: HACK compile-as-derivation: build #:system "i586-gnu"., guix-commits, 2024/01/20
- 02/10: hurd-boot: Support system init: Create essential device nodes.,
guix-commits <=
- 06/10: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2024/01/20
- 05/10: DRAFT hurd-boot: Support second boot., guix-commits, 2024/01/20
- 10/10: Revert "HACK compile-as-derivation: build #:system "i586-gnu".", guix-commits, 2024/01/20
- 08/10: Revert "DRAFT daemon: Support chroot builds on GNU/Hurd.", guix-commits, 2024/01/20
- 07/10: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2024/01/20