From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eIHB3-000396-KV for guix-patches@gnu.org; Fri, 24 Nov 2017 11:50:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eIHAx-0001z7-D1 for guix-patches@gnu.org; Fri, 24 Nov 2017 11:50:09 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:47498) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eIHAx-0001tz-64 for guix-patches@gnu.org; Fri, 24 Nov 2017 11:50:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eIHAw-0003tV-KK for guix-patches@gnu.org; Fri, 24 Nov 2017 11:50:02 -0500 Subject: [bug#29409] [PATCH] vm: Use os-defined initrd intead of base-initrd. References: <877euhtjkj.fsf@gmail.com> In-Reply-To: <877euhtjkj.fsf@gmail.com> Resent-Message-ID: From: Mathieu Othacehe Date: Fri, 24 Nov 2017 17:49:38 +0100 Message-Id: <1511542178-13819-1-git-send-email-m.othacehe@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 29409@debbugs.gnu.org * gnu/system/vm.scm (system-disk-image, system-qemu-image, virtualized-operating-system): Replace base-initrd by (operating-system-initrd os). The system produced were always using base-initrd even if the user had defined a custom initrd based on raw-initrd in the os declaration. --- Hi, I was able to test this fix with the following command : make check-system TESTS="installed-os" and also with an os with a custom raw-initrd. The produced system uses the specified raw-initrd instead of always using base-initrd. Thanks, Mathieu gnu/system/vm.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 4424608..3ddb41d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -423,7 +423,8 @@ to USB sticks meant to be read-only." ;; install QEMU networking or anything like that. Assume USB ;; mass storage devices (usb-storage.ko) are available. (initrd (lambda (file-systems . rest) - (apply base-initrd file-systems + (apply (operating-system-initrd os) + file-systems #:volatile-root? #t rest))) @@ -488,7 +489,8 @@ of the GNU system as described by OS." (let ((os (operating-system (inherit os) ;; Use an initrd with the whole QEMU shebang. (initrd (lambda (file-systems . rest) - (apply base-initrd file-systems + (apply (operating-system-initrd os) + file-systems #:virtio? #t rest))) @@ -574,7 +576,8 @@ environment with the store shared with the host. MAPPINGS is a list of (target "/dev/vda"))) (initrd (lambda (file-systems . rest) - (apply base-initrd file-systems + (apply (operating-system-initrd os) + file-systems #:volatile-root? #t #:virtio? #t rest))) -- 2.7.4