[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
62/65: DRAFT hurd-boot: Support second boot.
From: |
guix-commits |
Subject: |
62/65: DRAFT hurd-boot: Support second boot. |
Date: |
Fri, 14 Jul 2023 10:06:09 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 2ed18a51bf314eb5b1d3378907e7bdad7664e4b4
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")
- 44/65: gnu: guile-git: Skip http proxy test on the Hurd., (continued)
- 44/65: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/07/14
- 45/65: gnu: glib: Disable tests for the Hurd., guix-commits, 2023/07/14
- 43/65: gnu: graphite2: Skip test on the Hurd., guix-commits, 2023/07/14
- 54/65: gnu: hurd: Support native build on the Hurd., guix-commits, 2023/07/14
- 47/65: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/07/14
- 56/65: self: Build gnu/packages/*.go in 26 steps on the Hurd., guix-commits, 2023/07/14
- 29/65: gnu: emacs: Depend on libc-for-target., guix-commits, 2023/07/14
- 32/65: gnu: parted: Disable tests for the Hurd., guix-commits, 2023/07/14
- 58/65: gnu: guix: Disable some tests on the Hurd., guix-commits, 2023/07/14
- 59/65: gnu: guix: Update to 1.4.0-8.7f38c79689., guix-commits, 2023/07/14
- 62/65: DRAFT hurd-boot: Support second boot.,
guix-commits <=
- 61/65: DRAFT hurd: Support second boot., guix-commits, 2023/07/14
- 13/65: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/07/14
- 31/65: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 33/65: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/07/14
- 37/65: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/14
- 40/65: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/07/14
- 52/65: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/07/14
- 48/65: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/14
- 65/65: locale: Set %default-locale-definitions to glibc/hurd on the Hurd., guix-commits, 2023/07/14
- 53/65: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/07/14