[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
83/84: DRAFT hurd-boot: Support second boot.
From: |
guix-commits |
Subject: |
83/84: DRAFT hurd-boot: Support second boot. |
Date: |
Wed, 14 Jun 2023 06:24:03 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 12ebbc8659c673e07b9f32b8da5f3a6b85a88d25
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")
- 76/84: gnu: harfbuzz: Support build for the Hurd., (continued)
- 76/84: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/06/14
- 72/84: gnu: graphite2: Skip test for the Hurd., guix-commits, 2023/06/14
- 82/84: DRAFT hurd: Support second boot., guix-commits, 2023/06/14
- 62/84: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/06/14
- 21/84: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/06/14
- 03/84: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/14
- 23/84: bootloader: grub: Use rumpdisk-style root when booting with "noide"., guix-commits, 2023/06/14
- 52/84: gnu: c-ares: Skip failing tests for the Hurd., guix-commits, 2023/06/14
- 54/84: gnu: libgcrypt: Skip hanging benchmark tests for the Hurd., guix-commits, 2023/06/14
- 60/84: gnu: e2fsprogs: Skip failing tests for the Hurd., guix-commits, 2023/06/14
- 83/84: DRAFT hurd-boot: Support second boot.,
guix-commits <=
- 84/84: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/06/14
- 65/84: gnu: ruby-2.6: Skip test for the Hurd., guix-commits, 2023/06/14
- 81/84: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/14
- 17/84: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/14
- 02/84: gnu: glibc/hurd-headers: Properly cross-build., guix-commits, 2023/06/14
- 33/84: gnu: commencement: mig-boot0: Update to 1.8+git20230520., guix-commits, 2023/06/14
- 35/84: gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216., guix-commits, 2023/06/14
- 44/84: gnu: m4: Skip gnulib stack-overflow tests for the Hurd., guix-commits, 2023/06/14
- 49/84: gnu: mpfr: Skip failing test for the Hurd., guix-commits, 2023/06/14
- 55/84: gnu: tcl: Remove failing tests for the Hurd.., guix-commits, 2023/06/14