guix-commits
[Top][All Lists]
Advanced

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

01/03: linux-boot: Ensure /etc exists on the root file system.


From: Ludovic Courtès
Subject: 01/03: linux-boot: Ensure /etc exists on the root file system.
Date: Wed, 29 Nov 2017 10:45:48 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 748d4a84d13eb14ad0b434dbd94df43d51864048
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 29 11:31:56 2017 +0100

    linux-boot: Ensure /etc exists on the root file system.
    
    Fixes a regression introduced in
    c8289690365887ca1dd122645e479a89cf7cd969 whereby /etc would no longer be
    created as a result of calling 'mark-as-not-killable'.
    
    This would affect ISO images because 'make-iso9660-image' does not
    create /etc by default.  In particular, the ISO installation image as
    created by the "iso-image-installer" test would fail to boot while
    creating the /root/etc/mtab symlink:
    <https://hydra.gnu.org/build/2352514/nixlog/9/raw>.
    
    * gnu/build/linux-boot.scm (mount-root-file-system): Make sure /root/etc
    exists.
---
 gnu/build/linux-boot.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index a1ff4dd..8ac99af 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -270,6 +270,7 @@ using the kernel build-in overlayfs."
   ;; Make sure /root/etc/mtab is a symlink to /proc/self/mounts.
   (false-if-exception
     (delete-file "/root/etc/mtab"))
+  (mkdir-p "/root/etc")
   (symlink "/proc/self/mounts" "/root/etc/mtab"))
 
 (define (switch-root root)



reply via email to

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