guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: linux-boot: Don't create /root before it's used.


From: guix-commits
Subject: 01/03: linux-boot: Don't create /root before it's used.
Date: Sun, 26 Nov 2023 08:58:35 -0500 (EST)

nckx pushed a commit to branch core-updates
in repository guix.

commit aa43d911246e82811fd290b438f657b0211c3655
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Oct 22 02:00:00 2023 +0200

    linux-boot: Don't create /root before it's used.
    
    * gnu/build/linux-boot.scm (boot-system): Postpone the MKDIR of /root.
    
    Change-Id: I589316a5ddf41cada02173ed4dd5b7df09b795e8
---
 gnu/build/linux-boot.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 84726363c0..548e28a1c9 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -611,10 +611,6 @@ upon error."
 the root file system...\n" root-delay)
             (sleep root-delay)))
 
-        ;; Prepare the real root file system under /root.
-        (unless (file-exists? "/root")
-          (mkdir "/root"))
-
         (when (procedure? pre-mount)
           ;; Do whatever actions are needed before mounting the root file
           ;; system--e.g., installing device mappings.  Error out when the
@@ -631,6 +627,10 @@ the root file system...\n" root-delay)
           (false-if-exception           ; failure is not fatal
            (resume-if-hibernated (find-long-option "resume" args))))
 
+        ;; Prepare the real root file system under /root.
+        (unless (file-exists? "/root")
+          (mkdir "/root"))
+
         (setenv "EXT2FS_NO_MTAB_OK" "1")
 
         ;; Mount the root file system.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]