[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/15: DRAFT hurd-boot: Support second boot.
From: |
guix-commits |
Subject: |
08/15: DRAFT hurd-boot: Support second boot. |
Date: |
Sat, 13 Jan 2024 07:15:41 -0500 (EST) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 5cb455bcc4396815262d7248f40ec931b3c73197
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue May 30 18:08:38 2023 +0200
DRAFT hurd-boot: Support second boot.
* gnu/build/hurd-boot.scm (boot-hurd-system): Check for stale shepherd
socket
and remove it. Be chattier about /hurd symlink replacement.
---
gnu/build/hurd-boot.scm | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index daf4fb41ab..23ace25d4f 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -322,18 +322,29 @@ XXX TODO: use Linux xattr/setxattr to remove (settrans
in) /libexec/RUNSYSTEM
(let* ((args (command-line))
(system (find-long-option "gnu.system" args))
- (to-load (find-long-option "gnu.load" args)))
+ (to-load (find-long-option "gnu.load" args))
+ (profile (string-append system "/profile"))
+ (bin (string-append profile "/bin"))
+ (sbin (string-append profile "/bin")))
- (false-if-exception (delete-file "/hurd"))
- (let ((hurd/hurd (readlink* (string-append system "/profile/hurd"))))
- (symlink hurd/hurd "/hurd"))
+ (setenv "PATH" (string-append bin ":" sbin))
+
+ (when (file-exists? "/var/run/shepherd/socket")
+ (format #t "Removing stale shepherd socket...\n")
+ (delete-file "/var/run/shepherd/socket"))
(unless (file-exists? "/servers/startup")
(format #t "Creating essential device nodes...\n")
(make-hurd-device-nodes))
+ (let ((profile/hurd (readlink* (string-append profile "/hurd"))))
+ (when (file-exists? "/hurd")
+ (format #t "Removing stale /hurd link\n")
+ (delete-file "/hurd"))
+ (format #t "Linking /hurd from ~a...\n" profile/hurd)
+ (symlink profile/hurd "/hurd"))
+
(format #t "Setting-up essential translators...\n")
- (setenv "PATH" (string-append system "/profile/bin"))
(set-hurd-device-translators)
(format #t "Starting pager...\n")
- branch hurd-team created (now 1f2f78ace8), guix-commits, 2024/01/13
- 01/15: gnu: gcc: Fix building cross compiler for the Hurd., guix-commits, 2024/01/13
- 02/15: gnu: gnumach-headers: Update to v1.8+git20230410., guix-commits, 2024/01/13
- 04/15: hurd: Support system init in /libexec/runsystem., guix-commits, 2024/01/13
- 05/15: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2024/01/13
- 07/15: DRAFT hurd: Support second boot., guix-commits, 2024/01/13
- 03/15: gnu: hurd-headers: Update to v0.9.git20231217., guix-commits, 2024/01/13
- 08/15: DRAFT hurd-boot: Support second boot.,
guix-commits <=
- 06/15: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2024/01/13
- 13/15: Revert "HACK compile-as-derivation: build #:system "i586-gnu".", guix-commits, 2024/01/13
- 12/15: HACK compile-as-derivation: build #:system "i586-gnu"., guix-commits, 2024/01/13
- 15/15: Revert "gnu: binutils: Update to 2.41.", guix-commits, 2024/01/13
- 09/15: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2024/01/13
- 10/15: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2024/01/13
- 11/15: Revert "DRAFT daemon: Support chroot builds on GNU/Hurd.", guix-commits, 2024/01/13
- 14/15: Revert "gnu: binutils: Use gexps.", guix-commits, 2024/01/13