82/84: DRAFT hurd: Support second boot.

[guix-commits]

janneke pushed a commit to branch wip-hurd
in repository guix.

commit 4ab613a8fa37f19ba96d86ed54b1860a1c483375
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue May 30 18:02:38 2023 +0200

    DRAFT hurd: Support second boot.
    
    XXX This works beautifully, also on my x60, as long as the filesystem is
    clean.  Although our fsck in libexec/runsystem doesn't work without or with
    the current ftab, this may be a bad idea?
    
    This avoids hanging upon second boot and ensures a declarative /hurd and 
/dev.
    
    * gnu/packages/patches/hurd-startup.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/hurd.scm (hurd): Use it.
    [arguments]: In stage create-runsystem remove /dev/urandom.
---
 gnu/local.mk                            |  1 +
 gnu/packages/hurd.scm                   |  6 ++-
 gnu/packages/patches/hurd-startup.patch | 82 +++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 8ae800b942..90d9aab293 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1365,6 +1365,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/hurd-add-without-rump-configure-option.patch \
   %D%/packages/patches/hurd-fix-rumpdisk-build.patch           \
   %D%/packages/patches/hurd-rumpdisk-no-hd.patch               \
+  %D%/packages/patches/hurd-startup.patch                      \
   
%D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods-2.patch 
\
   
%D%/packages/patches/hurd-fix-types-of-read-write-and-readables-methods.patch \
   %D%/packages/patches/hwloc-1-test-btrfs.patch                        \
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index e236c5c71c..b6c6a92309 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -332,7 +332,8 @@ Hurd-minimal package which are needed for both glibc and 
GCC.")
     (source (origin
               (inherit (package-source hurd-headers))
               (patches (search-patches "hurd-fix-rumpdisk-build.patch"
-                                       "hurd-rumpdisk-no-hd.patch"))))
+                                       "hurd-rumpdisk-no-hd.patch"
+                                       "hurd-startup.patch"))))
     (version (package-version hurd-headers))
     (arguments
      `(#:phases
@@ -403,6 +404,9 @@ rm -f /servers/socket/1
 # Note: this /hurd/ gets substituted
 settrans --create /servers/socket/1 /hurd/pflocal
 
+# Upon second boot, (file-exists? /dev/null) in hurd-boot-system hangs unless:
+rm -f /dev/urandom
+
 # parse multiboot arguments
 for i in \"$@\"; do
     case $i in
diff --git a/gnu/packages/patches/hurd-startup.patch 
b/gnu/packages/patches/hurd-startup.patch
new file mode 100644
index 0000000000..9c0d4fa34e
--- /dev/null
+++ b/gnu/packages/patches/hurd-startup.patch
@@ -0,0 +1,82 @@
+This avoids hanging upon second boot and ensures a declarative /dev.
+
+Upstream status: Not presented upstream.
+
+From a15d281ea012ee360c45376e964d35f6292ac549 Mon Sep 17 00:00:00 2001
+From: Janneke Nieuwenhuizen <janneke@gnu.org>
+Date: Sat, 27 May 2023 17:28:22 +0200
+Subject: [PATCH] startup: Remove /hurd, /dev, create /servers.
+
+This avoids hanging upon second boot and ensures a declarative /hurd
+and /dev.
+
+* startup/startup.c (rm_r, create_servers): New functions.
+(main): Use them to remove /dev and create /servers.  Remove /hurd
+symlink.
+---
+ startup/startup.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/startup/startup.c b/startup/startup.c
+index feb7d265..5f380194 100644
+--- a/startup/startup.c
++++ b/startup/startup.c
+@@ -732,6 +732,42 @@ parse_opt (int key, char *arg, struct argp_state *state)
+   return 0;
+ }
+ 
++#include <ftw.h>
++static int
++rm_r (char const *file_name)
++{
++  int callback (char const *file_name, struct stat64 const *stat_buffer,
++                int type_flag, struct FTW *ftw_buffer)
++  {
++    fprintf (stderr, "startup: removing: %s\n", file_name);
++    return remove (file_name);
++  }
++
++  return nftw64 (file_name, callback, 0, FTW_DEPTH | FTW_MOUNT | FTW_PHYS);
++}
++
++void
++create_servers ()
++{
++  char const *servers[] = {
++    "/servers/startup",
++    "/servers/exec",
++    "/servers/proc",
++    "/servers/password",
++    "/servers/default-pager",
++    "/servers/crash-dump-core",
++    "/servers/kill",
++    "/servers/suspend",
++    0,
++  };
++  mkdir ("/servers", 0755);
++  for (char const **p = servers; *p; p++)
++    open (*p, O_WRONLY | O_APPEND | O_CREAT, 0444);
++  mkdir ("/servers/socket", 0755);
++  mkdir ("/servers/bus", 0755);
++  mkdir ("/servers/bus/pci", 0755);
++}
++
+ int
+ main (int argc, char **argv, char **envp)
+ {
+@@ -741,6 +777,12 @@ main (int argc, char **argv, char **envp)
+   mach_port_t consdev;
+   struct argp argp = { options, parse_opt, 0, doc };
+ 
++  /* GNU Guix creates fresh ones in boot-hurd-system. */
++  unlink ("/hurd");
++  rm_r ("/dev");
++  mkdir ("/dev", 0755);
++  create_servers ();
++
+   /* Parse the arguments.  We don't want the vector reordered, we
+      should pass on to our child the exact arguments we got and just
+      ignore any arguments that aren't flags for us.  ARGP_NO_ERRS
+-- 
+2.40.1
+