diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-03-13 16:44:02 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-03-13 23:12:43 +0100 |
commit | 59e80445882f8b0379e54916f89510c0deda6698 (patch) | |
tree | 2769fffa217f630349c5a7207ee92204af046f9d /gnu/packages/linux.scm | |
parent | 13f62aef2d87dc888f89fea3260eaa39938e6640 (diff) | |
download | patches-59e80445882f8b0379e54916f89510c0deda6698.tar patches-59e80445882f8b0379e54916f89510c0deda6698.tar.gz |
Remove traces of "GuixSD".
* gnu/bootloader/extlinux.scm (extlinux-configuration-file): Remove
mentions of "GuixSD".
* gnu/bootloader/grub.scm (install-grub-efi): Likewise.
* gnu/build/vm.scm (make-iso9660-image): Change default #:volume-id to
"Guix_image".
(initialize-hard-disk): Search for the "Guix_image" label.
* gnu/ci.scm (system-test-jobs, tarball-jobs): Remove "GuixSD".
* gnu/installer/newt/welcome.scm (run-welcome-page): Likewise.
* gnu/packages/audio.scm (supercollider)[description]: Likewise.
* gnu/packages/curl.scm (curl): Likewise.
* gnu/packages/emacs.scm (emacs): Likewise.
* gnu/packages/gnome.scm (network-manager): Likewise.
* gnu/packages/julia.scm (julia): Likewise.
* gnu/packages/linux.scm (alsa-plugins): Likewise.
(powertop, wireless-regdb): Likewise.
* gnu/packages/package-management.scm (guix): Likewise.
* gnu/packages/polkit.scm (polkit): Likewise.
* gnu/packages/tex.scm (texlive-bin): Likewise.
* gnu/services/base.scm (file-systems->fstab): Likewise.
* gnu/services/cups.scm (%cups-activation): Likewise.
* gnu/services/mail.scm (%dovecot-activation): Likewise.
* gnu/services/messaging.scm (prosody-configuration)[log]: Likewise.
* gnu/system/examples/vm-image.tmpl (vm-image-motd): Likewise.
* gnu/system/install.scm (installation-os)[file-systems]: Change root
file system label to "Guix_image".
* gnu/system/mapped-devices.scm (check-device-initrd-modules):
Remove "GuixSD".
* gnu/system/vm.scm (system-docker-image): Likewise.
(system-disk-image)[root-label]: Change to "Guix_image".
* gnu/tests/install.scm (run-install): Remove "GuixSD".
* guix/modules.scm (guix-module-name?): Likewise.
* nix/libstore/optimise-store.cc: Likewise.
Diffstat (limited to 'gnu/packages/linux.scm')
-rw-r--r-- | gnu/packages/linux.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e4a58834a9..1cdffb8c79 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1112,7 +1112,7 @@ MIDI functionality to the Linux-based operating system.") (outputs '("out" "pulseaudio" "jack")) (arguments `(#:configure-flags '(;; Do not install a "local" configuration targeted - ;; for /etc/alsa. On GuixSD plugins are loaded from + ;; for /etc/alsa. On Guix System plugins are loaded from ;; the ALSA service, and other distributions likely ;; won't use these files. "--with-alsalconfdir=/tmp/noop") @@ -1579,7 +1579,7 @@ devices. It replaces @code{iwconfig}, which is deprecated.") '(#:phases (modify-phases %standard-phases ;; TODO: Patch some hardcoded "wlan0" in calibrate/calibrate.cpp to - ;; allow calibrating the network interface in GuixSD. + ;; allow calibrating the network interface in Guix System. (add-after 'unpack 'patch-absolute-file-names (lambda* (#:key inputs #:allow-other-keys) (let ((kmod (assoc-ref inputs "kmod"))) @@ -2379,7 +2379,7 @@ compliance.") #:tests? #f ;no tests #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" out) - (string-append "LSB_ID=GuixSD") + (string-append "LSB_ID=Guix") (string-append "DISTRO_PUBKEY=/dev/null") (string-append "DISTRO_PRIVKEY=/dev/null") (string-append "REGDB_PUBKEY=/dev/null") |