[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/13: linux-boot: Don't create /root before it's used.
From: |
guix-commits |
Subject: |
10/13: linux-boot: Don't create /root before it's used. |
Date: |
Sun, 26 Nov 2023 18:19:25 -0500 (EST) |
nckx pushed a commit to branch master
in repository guix.
commit d553249f7296b6e5807be75beb258dc82e86e928
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.
- 01/13: gnu: loksh: Update to 7.4., (continued)
- 01/13: gnu: loksh: Update to 7.4., guix-commits, 2023/11/26
- 04/13: gnu: opensmtpd: Update to 7.4.0p1., guix-commits, 2023/11/26
- 06/13: gnu: dpkg: Update to 1.22.1., guix-commits, 2023/11/26
- 02/13: gnu: openssh: Update to 9.5p1., guix-commits, 2023/11/26
- 05/13: gnu: erofs-utils: Update to 1.7.1., guix-commits, 2023/11/26
- 08/13: gnu: knot: Update to 3.3.2., guix-commits, 2023/11/26
- 13/13: gnu: fio: Update to 3.36., guix-commits, 2023/11/26
- 07/13: gnu: nwipe: Update to 0.35., guix-commits, 2023/11/26
- 09/13: gnu: Add libnsfb., guix-commits, 2023/11/26
- 11/13: gnu: bfs: Fix Texinfo typo., guix-commits, 2023/11/26
- 10/13: linux-boot: Don't create /root before it's used.,
guix-commits <=
- 12/13: gnu: bfs: Update to 3.0.4., guix-commits, 2023/11/26