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 @@ (define (repair fs)
 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 @@ (define (repair fs)
           (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.