system: hurd: Fix fsck.

* gnu/build/hurd-boot.scm (make-hurd-device-nodes): Create "/dev/console".
* gnu/system.scm (hurd-multiboot-modules): Run ext2fs.static with --readonly.
* gnu/packages/hurd.scm (hurd)[arguments]: Use "fsysopts / --update
--writable" and "fsck --preen --writable" and Debian's return value meme.
Also substitute "/sbin/" in "sbin/fsck.c".

Change-Id: I7bc3cf334939d6f1f00ee8615810338167904e8e
Co-authored-by: Yelninei <yelninei@tutamail.com>
Fixes: #4820

3 files changed, 78 insertions, 13 deletions

diff --git a/gnu/build/hurd-boot.scm b/gnu/build/hurd-boot.scm
index afda609a184..b6f8e6154e6 100644
--- a/gnu/build/hurd-boot.scm
+++ b/gnu/build/hurd-boot.scm
@@ -80,10 +80,23 @@ Return the value associated with OPTION, or #f on failure."
     (string-append root (if (string-suffix? "/" root) "" "/") dir))
 
   (mkdir-p (scope "dev"))
-  ;; Don't create /dev/null etc just yet; the store
-  ;; messes-up the permission bits.
-  ;; Don't create /dev/console, /dev/vcs, etc.: they are created by
-  ;; console-run on first boot.
+  ;; XXX: We must have `/dev/console` otherwise `console-run` tries to
+  ;; create it while the file-system is still read-only.
+  (for-each (lambda (file)
+              (call-with-output-file (scope file)
+                (lambda (port)
+                  (display file port)   ;avoid hard-linking
+                  (chmod port #o666))))
+            '("dev/console"
+              ;; XXX What about vcs?
+              ;; Don't create /dev/null etc just yet; the store
+              ;; messes-up the permission bits.
+              ;; "dev/null"
+              ;; "dev/zero"
+              ;; "dev/full"
+              ;; "dev/random"
+              ;; "dev/urandom"
+              ))
 
   (mkdir-p (scope "servers"))
   (for-each (lambda (file)
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 5d1c6628090..84b35632d33 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -459,12 +459,55 @@ Hurd-minimal package which are needed for both glibc and GCC.")
 # Remove this script when Linux and the Hurd have xattr patches.
 PATH=@PATH@
 
-fsck --yes --force /
-fsysopts / --writable
+fsysopts / --update --readonly
 
+if test -f /etc/fstab; then
+    fsck --all --preen --verbose
+else
+    echo \"No /etc/fstab found, ignoring...\"
+fi
+
+case $? in
+# Successful completion
+0)
+    fsysopts / --writable
+    ;;
+# Filesystem modified (but ok now)
+1)
+    fsysopts / --writable
+    ;;
+# Filesystem modified, filesystem should be restarted
+# Ideally we would only restart the filesystem
+2 | 3)
+    # Note: this /sbin gets substituted
+    /sbin/reboot
+    ;;
+# Fsck couldn't fix it.
+4 | 5 | 8 | 9)
+    echo \"Automatic boot failed... help!\"
+    exit 1
+    ;;
+# Signal that really interrupted something
+20 | 130 | 131)
+    echo \"Boot interrupted\"
+    exit 1
+    ;;
+# Special `let fsck finish' interruption (SIGQUIT)
+12)
+    echo \"Boot interrupted (filesystem checks complete)\"
+    exit 1
+    ;;
+# Oh dear.
+*)
+    echo \"Unknown error during fsck (exit status $?)\"
+    exit 1
+    ;;
+esac
+
+# Only after this we can run guile.
 mkdir -p /servers/socket
 rm -f /servers/socket/1
-# Note: this /hurd/ gets substituted
+# 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:
@@ -489,7 +532,8 @@ exec ${system}/rc \"$@\"
                     (coreutils (assoc-ref inputs "coreutils"))
                     (sed  (assoc-ref inputs "sed"))
                     (grep (assoc-ref inputs "grep"))
-                    (util-linux (assoc-ref inputs "util-linux")))
+                    (util-linux (assoc-ref inputs "util-linux"))
+                    (e2fsprogs (assoc-ref inputs "e2fsprogs")))
                (substitute* '("daemons/runttys.c" "daemons/getty.c" "utils/login.c")
                  (("/bin/login")
                   (string-append out "/bin/login"))
@@ -505,9 +549,13 @@ exec ${system}/rc \"$@\"
                ;; name.
                (substitute* '("boot/boot.c"
                               "daemons/console-run.c"
-                              "startup/startup.c")
+                              "startup/startup.c"
+                              "sutils/swapon.c"
+                              "tmpfs/tmpfs.c")
                  (("/hurd/")
-                  (string-append out "/hurd/")))
+                  (string-append out "/hurd/"))
+                 (("/sbin/")
+                  (string-append out "/sbin/")))
                (substitute* '("libdiskfs/boot-start.c"
                               "libdiskfs/opts-std-startup.c")
                  (("_HURD_STARTUP")
@@ -521,12 +569,15 @@ exec ${system}/rc \"$@\"
                   (string-append "PATH=" out "/bin"
                                  ":" out "/sbin"
                                  ":" coreutils "/bin"
+                                 ":" e2fsprogs "/sbin"
                                  ":" grep "/bin"
                                  ":" sed "/bin"
                                  ":" util-linux "/sbin\n"))
                  (("/sbin/") (string-append out "/sbin/"))
                  (("/libexec/") (string-append out "/libexec/"))
-                 (("/hurd/") (string-append out "/hurd/"))))))
+                 (("/hurd/") (string-append out "/hurd/")))
+               (substitute* "sutils/fsck.c"
+                 (("/sbin/") (in-vicinity e2fsprogs "sbin/"))))))
          (add-after 'patch-shebangs 'patch-libexec-shebangs
            (lambda* (#:key inputs outputs #:allow-other-keys)
              ;; XXX: Since the 'patch-shebangs' phase doesn't traverse
@@ -536,8 +587,7 @@ exec ${system}/rc \"$@\"
                     (path (list (string-append bash "/bin"))))
                (for-each (lambda (file)
                            (patch-shebang file path))
-                         (find-files (string-append out "/libexec")))
-               #t)))
+                         (find-files (string-append out "/libexec"))))))
          (add-after 'build 'build-libdde-linux
           (lambda* (#:key inputs native-inputs #:allow-other-keys)
             (let ((arch ,(match (or (%current-target-system)
@@ -655,6 +705,7 @@ exec ${system}/rc \"$@\"
        ;; Tools for the /libexec/* scripts.
        ("bash-minimal" ,bash-minimal)
        ("coreutils" ,coreutils)
+       ("e2fsprogs" ,e2fsprogs)                  ;for fsck.ext2
        ("sed" ,sed)
        ("grep" ,grep)
        ("util-linux" ,util-linux "static")       ;libuuid.a, for parted
diff --git a/gnu/system.scm b/gnu/system.scm
index 058bd72920a..9d29cd40486 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1553,6 +1553,7 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
          (root-file-system-command
           (list (file-append hurd "/hurd/ext2fs.static")
                 "ext2fs"
+                "--readonly"
                 "--multiboot-command-line='${kernel-command-line}'"
                 "--exec-server-task='${exec-task}'"
                 "--store-type=typed"