From 4e9ded6d276bf488593f53a84b6e50771abac13f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 8 Nov 2020 14:27:35 +0100 Subject: image: Offload "disk-image" derivations. This is a followup to 99efa804bd6df5de4760ec5974ed2297f1746366. * gnu/system/image.scm (system-disk-image): Pass #:local-build? #f to 'computed-file'. --- gnu/system/image.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/system') diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 4075a26552..81152f0fc4 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -414,6 +414,7 @@ image ~a { out-image)) (convert-disk-image out-image '#$format #$output))))) (computed-file name builder + #:local-build? #f ;too I/O-intensive #:options `(#:substitutable? ,substitutable?)))) -- cgit v1.2.3 From 7a20c1676a8421f3ac06a2634a27c2837293df0b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Nov 2020 12:20:09 +0100 Subject: vm: 'system-qemu-image' forces the use of i386/BIOS GRUB. Fixes . Reported by Maxim Cournoyer . * gnu/system/vm.scm (system-qemu-image): Add 'bootloader' field to OS. --- gnu/system/vm.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/system') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 21d777a3fe..c9580f6e7f 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -655,7 +655,14 @@ of the GNU system as described by OS." 'dce))) - (let* ((os (operating-system (inherit os) + (let* ((os (operating-system + (inherit os) + + ;; As in 'virtualized-operating-system', use BIOS-style GRUB. + (bootloader (bootloader-configuration + (bootloader grub-bootloader) + (target "/dev/vda"))) + ;; Assume we have an initrd with the whole QEMU shebang. ;; Force our own root file system. Refer to it by UUID so that -- cgit v1.2.3 From 000e7a0abc747ab6eb4fc23e80e4e9fbe8e75781 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 10 Nov 2020 21:49:15 +0100 Subject: vm: expression->derivation-in-linux-vm: Run in a UTF-8 locale. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Add calls to 'setenv' and 'setlocale'. --- gnu/system/vm.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/system') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index c9580f6e7f..07a59a3cd2 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -224,6 +224,12 @@ substitutable." (use-modules (guix build utils) (gnu build vm)) + ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded + ;; by 'estimated-partition-size' below. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + (let* ((native-inputs '#+(list qemu (canonical-package coreutils))) (linux (string-append -- cgit v1.2.3