diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-15 23:45:34 +0100 |
| commit | 4e5e05d40908e9f1336ffc5a6c4928ab61ad034c (patch) | |
| tree | ad6d6be0ece396ba3353871a5691e514253508f8 /gnu/system/vm.scm | |
| parent | 2c400ae94207b3b84fcdcaa21c122076c050d307 (diff) | |
| parent | e1fa3ea9fe8d01dd124c5e304bde9243876378ba (diff) | |
| download | guix-patches-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar guix-patches-4e5e05d40908e9f1336ffc5a6c4928ab61ad034c.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 15 |
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 |