Subject: [PATCH v3 07/17] hurd-boot: Support second boot.

From: Janneke Nieuwenhuizen <[email-masked]>
Date: Fri, 25 Oct 2024 11:39:59 +0200

* gnu/build/hurd-boot.scm (boot-hurd-system): Check for stale shepherd socket
and remove it.  Be chattier about /hurd symlink replacement.

Change-Id: I5e528c131ebeadb7ebc9727336a0f9301af3e68e
---
 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 @@ (define* (boot-hurd-system #:key (on-error 'debug))
 
      (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")
-- 
2.46.0