[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
88/89: DRAFT hurd-boot: Support second boot.
From: |
guix-commits |
Subject: |
88/89: DRAFT hurd-boot: Support second boot. |
Date: |
Tue, 20 Jun 2023 05:59:04 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 51f4953ce57952ef6ffa8ffc34b0ef331680be64
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 d3f9daeec0..4b6e5e0b66 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")
- 51/89: gnu: libbsd: Skip failing test on the Hurd., (continued)
- 51/89: gnu: libbsd: Skip failing test on the Hurd., guix-commits, 2023/06/20
- 75/89: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/06/20
- 73/89: gnu: guile-git: Skip http proxy test on the Hurd., guix-commits, 2023/06/20
- 76/89: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/06/20
- 78/89: gnu: fontforge: Support build on the Hurd., guix-commits, 2023/06/20
- 81/89: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/20
- 80/89: gnu: guile-2.0: Skip failing tests on the Hurd., guix-commits, 2023/06/20
- 82/89: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/06/20
- 83/89: build: Build gnu/packages/*.go in four steps., guix-commits, 2023/06/20
- 86/89: gnu: guix: Update to 1.4.0-8.656960a93a., guix-commits, 2023/06/20
- 88/89: DRAFT hurd-boot: Support second boot.,
guix-commits <=
- 03/89: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/20
- 08/89: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/20
- 09/89: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/06/20
- 04/89: gnu: hurd: Update supported systems., guix-commits, 2023/06/20
- 11/89: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/20
- 12/89: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/20
- 18/89: gnu: parted: Support building for the Hurd., guix-commits, 2023/06/20
- 19/89: gnu: hurd: Add rumpkernel., guix-commits, 2023/06/20
- 21/89: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/06/20
- 23/89: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/06/20