[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
55/58: DRAFT hurd-boot: Support second boot.
From: |
guix-commits |
Subject: |
55/58: DRAFT hurd-boot: Support second boot. |
Date: |
Wed, 19 Jul 2023 03:00:52 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit d63c45f03326dad1f112342aaa5004e96eed9399
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 bd19fd5212..c412a9a394 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -309,18 +309,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")
- 22/58: gnu: e2fsprogs: Skip failing tests on the Hurd., (continued)
- 22/58: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/19
- 23/58: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/07/19
- 24/58: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/07/19
- 27/58: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/19
- 20/58: gnu: git: Skip failing test on the Hurd., guix-commits, 2023/07/19
- 32/58: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/07/19
- 34/58: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/19
- 02/58: gnu: guile: Skip hanging and failing pipe tests on the Hurd., guix-commits, 2023/07/19
- 56/58: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/07/19
- 48/58: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/07/19
- 55/58: DRAFT hurd-boot: Support second boot.,
guix-commits <=
- 17/58: gnu: libgcrypt: Skip hanging benchmark tests on the Hurd., guix-commits, 2023/07/19
- 11/58: gnu: python: Support native build on the Hurd., guix-commits, 2023/07/19
- 25/58: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/07/19
- 31/58: gnu: cmake-minimal: Skip tests on the Hurd., guix-commits, 2023/07/19
- 36/58: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/19
- 37/58: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/19
- 43/58: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/19
- 44/58: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/19
- 39/58: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/07/19
- 50/58: build: Build gnu/packages/*.go in five steps., guix-commits, 2023/07/19