aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-01-28 23:38:19 +0100
committerLudovic Courtès <ludo@gnu.org>2014-01-28 23:38:19 +0100
commitb0dd47a8d0c39dabf6d23aa24bf6a4ae650bd006 (patch)
tree88e12749f1d24076481af35d599bed89ae0582fa /gnu
parentf06afd4da2be6571e7a78e9745907ee9afc57967 (diff)
downloadguix-b0dd47a8d0c39dabf6d23aa24bf6a4ae650bd006.tar
guix-b0dd47a8d0c39dabf6d23aa24bf6a4ae650bd006.tar.gz
gnu: qemu-initrd: Adjust to allow booting with a non-empty /root.
* gnu/packages/linux-initrd.scm (qemu-initrd): Use 'mkdir-p' instead of 'mkdir' for /root/xchg and /root/{share,lib}. When TO-LOAD is a symlink, resolve it. (gnu-system-initrd): Fix typo in message.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/linux-initrd.scm22
1 files changed, 15 insertions, 7 deletions
diff --git a/gnu/packages/linux-initrd.scm b/gnu/packages/linux-initrd.scm
index 0134e89da8..5495e16e30 100644
--- a/gnu/packages/linux-initrd.scm
+++ b/gnu/packages/linux-initrd.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -280,7 +280,7 @@ the Linux kernel.")
(mount "none" "/root" "tmpfs"))
(mount-essential-file-systems #:root "/root")
- (mkdir "/root/xchg")
+ (mkdir-p "/root/xchg")
(mkdir-p "/root/nix/store")
(unless (file-exists? "/root/dev")
@@ -294,8 +294,8 @@ the Linux kernel.")
;; Copy the directories that contain .scm and .go files so that the
;; child process in the chroot can load modules (we would bind-mount
;; them but for some reason that fails with EINVAL -- XXX).
- (mkdir "/root/share")
- (mkdir "/root/lib")
+ (mkdir-p "/root/share")
+ (mkdir-p "/root/lib")
(mount "none" "/root/share" "tmpfs")
(mount "none" "/root/lib" "tmpfs")
(copy-recursively "/share" "/root/share"
@@ -305,9 +305,17 @@ the Linux kernel.")
(if to-load
- (begin
+ (letrec ((resolve
+ (lambda (file)
+ ;; If FILE is a symlink to an absolute file name,
+ ;; resolve it as if we were under /root.
+ (let ((st (lstat file)))
+ (if (eq? 'symlink (stat:type st))
+ (let ((target (readlink file)))
+ (resolve (string-append "/root" target)))
+ file)))))
(format #t "loading boot file '~a'...\n" to-load)
- (compile-file (string-append "/root/" to-load)
+ (compile-file (resolve (string-append "/root/" to-load))
#:output-file "/root/loader.go"
#:opts %auto-compilation-options)
(match (primitive-fork)
@@ -392,7 +400,7 @@ the Linux kernel.")
(sleep 2)
(reboot))
(begin
- (display "no init file passed via '--exec'\n")
+ (display "no init file passed via '--load'\n")
(display "entering a warm and cozy REPL\n")
((@ (system repl repl) start-repl))))))
#:name "qemu-system-initrd"