diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-05-02 15:32:30 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-05-02 15:32:30 +0200 |
| commit | 746ac457cc2748152a3a39d4296972fa20f19741 (patch) | |
| tree | 978f3bdb71cfd062df8da9be7ae0218d214626e1 /gnu/system | |
| parent | c457f109bec75bfbf4619f3e18bcd82c33a15c07 (diff) | |
| parent | 3a3e9f2bb586e79a7931163f0191df61591b8017 (diff) | |
| download | patches-746ac457cc2748152a3a39d4296972fa20f19741.tar patches-746ac457cc2748152a3a39d4296972fa20f19741.tar.gz | |
Merge branch 'version-1.0.0'
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 8 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index a140082c0b..0dbd31fe0a 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -4,9 +4,10 @@ ;; guix system reconfigure /etc/config.scm ;; -(use-modules (gnu) (srfi srfi-1)) +(use-modules (gnu) (guix) (srfi srfi-1)) (use-service-modules desktop networking ssh xorg) -(use-package-modules bootloaders certs fonts nvi wget xorg) +(use-package-modules bootloaders certs fonts nvi + package-management wget xorg) (define vm-image-motd (plain-file "motd" " \x1b[1;37mThis is the GNU system. Welcome!\x1b[0m @@ -34,6 +35,9 @@ accounts.\x1b[0m (locale "en_US.utf8") (keyboard-layout (keyboard-layout "us" "altgr-intl")) + ;; Label for the GRUB boot menu. + (label (string-append "GNU Guix " (package-version guix))) + (firmware '()) ;; Below we assume /dev/vda is the VM's hard disk. diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 92b03b01ad..124abd0fc9 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -283,6 +283,11 @@ INPUTS is a list of inputs (as for packages)." (sql-schema #$schema) + ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + (let ((inputs '#$(append (list qemu parted e2fsprogs dosfstools xorriso) (map canonical-package @@ -379,6 +384,11 @@ the image." (sql-schema #$schema) + ;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded. + (setenv "GUIX_LOCPATH" + #+(file-append glibc-utf8-locales "/lib/locale")) + (setlocale LC_ALL "en_US.utf8") + (let ((inputs '#$(append (list qemu parted e2fsprogs dosfstools) (map canonical-package |