From 748d4a84d13eb14ad0b434dbd94df43d51864048 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 29 Nov 2017 11:31:56 +0100
Subject: 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(+)

(limited to 'gnu/build/linux-boot.scm')

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index a1ff4dd1ea..8ac99af66c 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)
-- 
cgit v1.2.3


From 22bf86a6712d3440fa7463c2f2b55c65bf40595a Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 2 Dec 2017 20:53:17 +0100
Subject: linux-boot: Remove unneeded import.

* gnu/build/linux-boot.scm: Remove unnecessary autoload of (system base
compile).
---
 gnu/build/linux-boot.scm | 1 -
 1 file changed, 1 deletion(-)

(limited to 'gnu/build/linux-boot.scm')

diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 8ac99af66c..2547f1e0af 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -21,7 +21,6 @@
   #:use-module (rnrs io ports)
   #:use-module (system repl error-handling)
   #:autoload   (system repl repl) (start-repl)
-  #:autoload   (system base compile) (compile-file)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
   #:use-module (ice-9 match)
-- 
cgit v1.2.3