summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-11-12 10:47:25 +0100
committerLudovic Courtès <ludo@gnu.org>2020-11-12 10:47:25 +0100
commit07914def98ca0d148e3522466227304e45286786 (patch)
tree71f265728ced786cb70de2a5654c9beb45eb77c5 /gnu/system
parenta13063d6ac7434beed1c608ce3eb6fb39c740b33 (diff)
parentef1107e2cca9a5b6f7129d019aabac2f0e89a238 (diff)
Merge branch 'version-1.2.0'
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/vm.scm15
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 21d777a3fe..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
@@ -655,7 +661,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