diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/locale.scm | 3 | ||||
| -rw-r--r-- | gnu/system/shadow.scm | 8 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index 18bbe5ba32..dcbc93e3bf 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -147,8 +147,7 @@ data format changes between libc versions." (define %default-locale-libcs ;; The libcs for which we build locales by default. - ;; List the previous and current libc to ease transition. - (list glibc)) + (list glibc-2.31 glibc)) (define %default-locale-definitions ;; Arbitrary set of locales that are built by default. They are here mostly diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 7c57222716..59f0a02c8b 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -164,7 +165,12 @@ XTerm*utf8: always XTerm*metaSendsEscape: true\n")) (gdbinit (plain-file "gdbinit" "\ # Tell GDB where to look for separate debugging files. -set debug-file-directory ~/.guix-profile/lib/debug +guile +(use-modules (gdb)) +(execute (string-append \"set debug-file-directory \" + (or (getenv \"GDB_DEBUG_FILE_DIRECTORY\") + \"~/.guix-profile/lib/debug\"))) +end # Authorize extensions found in the store, such as the # pretty-printers of libstdc++. diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 3390f5a88f..da076a95f9 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -538,7 +538,7 @@ the operating system." ;; Even as root in a VM, the initializer would fail due to ;; lack of privileges if we use a root-directory that is on ;; a file system that is shared with the host (e.g., /tmp). - (root-directory "/guixsd-system-root")) + (root-directory "/guix-system-root")) (set-path-environment-variable "PATH" '("bin" "sbin") '(#+tar)) (mkdir root-directory) (initialize root-directory) @@ -708,8 +708,8 @@ with '-virtfs' options for the host file systems listed in SHARED-FS." '()) "-no-reboot" - "-object" "rng-random,filename=/dev/urandom,id=guixsd-vm-rng" - "-device" "virtio-rng-pci,rng=guixsd-vm-rng" + "-object" "rng-random,filename=/dev/urandom,id=guix-vm-rng" + "-device" "virtio-rng-pci,rng=guix-vm-rng" #$@(map virtfs-option shared-fs) "-vga std" |