nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2019-03-13 16:44:02 +01:00
parent 13f62aef2d
commit 59e8044588
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
27 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guix.texi
View File

@ -16484,7 +16484,7 @@ Defaults to @samp{"internal_plain"}.
@deftypevr {@code{prosody-configuration} parameter} maybe-string log @deftypevr {@code{prosody-configuration} parameter} maybe-string log
Set logging options. Advanced logging configuration is not yet supported Set logging options. Advanced logging configuration is not yet supported
by the Guix Prosody Service. See @url{https://prosody.im/doc/logging}. by the Prosody service. See @url{https://prosody.im/doc/logging}.
Defaults to @samp{"*syslog"}. Defaults to @samp{"*syslog"}.
@end deftypevr @end deftypevr

4
gnu/bootloader/extlinux.scm
View File

@ -57,10 +57,10 @@ corresponding to old generations of the system."
#~(call-with-output-file #$output #~(call-with-output-file #$output
(lambda (port) (lambda (port)
(let ((timeout #$(bootloader-configuration-timeout config))) (let ((timeout #$(bootloader-configuration-timeout config)))
(format port "# This file was generated from your GuixSD configuration. Any changes (format port "# This file was generated from your Guix configuration. Any changes
# will be lost upon reconfiguration. # will be lost upon reconfiguration.
UI menu.c32 UI menu.c32
MENU TITLE GuixSD Boot Options MENU TITLE GNU Guix Boot Options
PROMPT ~a PROMPT ~a
TIMEOUT ~a~%" TIMEOUT ~a~%"
(if (> timeout 0) 1 0) (if (> timeout 0) 1 0)

8
gnu/bootloader/grub.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -334,7 +334,7 @@ entries corresponding to old generations of the system."
#~(call-with-output-file #$output #~(call-with-output-file #$output
(lambda (port) (lambda (port)
(format port (format port
"# This file was generated from your GuixSD configuration. Any changes "# This file was generated from your Guix configuration. Any changes
# will be lost upon reconfiguration. # will be lost upon reconfiguration.
") ")
#$sugar #$sugar
@ -380,7 +380,7 @@ submenu \"GNU system, old configurations...\" {~%")
;; system whose root is mounted at MOUNT-POINT. ;; system whose root is mounted at MOUNT-POINT.
(let ((grub-install (string-append bootloader "/sbin/grub-install")) (let ((grub-install (string-append bootloader "/sbin/grub-install"))
(install-dir (string-append mount-point "/boot")) (install-dir (string-append mount-point "/boot"))
;; When installing GuixSD, it's common to mount EFI-DIR below ;; When installing Guix, it's common to mount EFI-DIR below
;; MOUNT-POINT rather than /boot/efi on the live image. ;; MOUNT-POINT rather than /boot/efi on the live image.
(target-esp (if (file-exists? (string-append mount-point efi-dir)) (target-esp (if (file-exists? (string-append mount-point efi-dir))
(string-append mount-point efi-dir) (string-append mount-point efi-dir)
@ -389,7 +389,7 @@ submenu \"GNU system, old configurations...\" {~%")
;; root partition. ;; root partition.
(setenv "GRUB_ENABLE_CRYPTODISK" "y") (setenv "GRUB_ENABLE_CRYPTODISK" "y")
(unless (zero? (system* grub-install "--boot-directory" install-dir (unless (zero? (system* grub-install "--boot-directory" install-dir
"--bootloader-id=GuixSD" "--bootloader-id=Guix"
"--efi-directory" target-esp)) "--efi-directory" target-esp))
(error "failed to install GRUB (EFI)"))))) (error "failed to install GRUB (EFI)")))))

6
gnu/build/vm.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
@ -422,7 +422,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
(string-append "boot/grub/grub.cfg=" config-file)))) (string-append "boot/grub/grub.cfg=" config-file))))
(define* (make-iso9660-image grub config-file os-drv target (define* (make-iso9660-image grub config-file os-drv target
#:key (volume-id "GuixSD_image") (volume-uuid #f) #:key (volume-id "Guix_image") (volume-uuid #f)
register-closures? (closures '())) register-closures? (closures '()))
"Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
GRUB configuration and OS-DRV as the stuff in it." GRUB configuration and OS-DRV as the stuff in it."
@ -550,7 +550,7 @@ passing it a directory name where it is mounted."
(lambda (port) (lambda (port)
(format port (format port
"insmod part_msdos~@ "insmod part_msdos~@
search --set=root --label GuixSD_image~@ search --set=root --label Guix_image~@
configfile /boot/grub/grub.cfg~%"))) configfile /boot/grub/grub.cfg~%")))
(display "creating EFI firmware image...") (display "creating EFI firmware image...")

4
gnu/ci.scm
View File

@ -235,7 +235,7 @@ system.")
(system-test-value test)))) (system-test-value test))))
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(description . ,(format #f "GuixSD '~a' system test" (description . ,(format #f "Guix '~a' system test"
(system-test-name test))) (system-test-name test)))
(long-description . ,(system-test-description test)) (long-description . ,(system-test-description test))
(license . ,(license-name gpl3+)) (license . ,(license-name gpl3+))
@ -270,7 +270,7 @@ system.")
`((derivation . ,(derivation-file-name drv)) `((derivation . ,(derivation-file-name drv))
(description . "Stand-alone binary Guix tarball") (description . "Stand-alone binary Guix tarball")
(long-description . "This is a tarball containing binaries of Guix and (long-description . "This is a tarball containing binaries of Guix and
all its dependencies, and ready to be installed on non-GuixSD distributions.") all its dependencies, and ready to be installed on \"foreign\" distributions.")
(license . ,(license-name gpl3+)) (license . ,(license-name gpl3+))
(home-page . ,%guix-home-page-url) (home-page . ,%guix-home-page-url)
(maintainers . ("bug-guix@gnu.org")))) (maintainers . ("bug-guix@gnu.org"))))

4
gnu/installer/newt/welcome.scm
View File

@ -92,8 +92,8 @@ we want this page to occupy all the screen space available."
the page. Ask the user to choose between manual installation, graphical the page. Ask the user to choose between manual installation, graphical
installation and reboot." installation and reboot."
(run-menu-page (run-menu-page
(G_ "GNU GuixSD install") (G_ "GNU Guix install")
(G_ "Welcome to GNU GuixSD installer! (G_ "Welcome to GNU Guix system installer!
Please note that the present graphical installer is still under heavy \ Please note that the present graphical installer is still under heavy \
development, so you might want to prefer using the shell based process. \ development, so you might want to prefer using the shell based process. \

2
gnu/packages/audio.scm
View File

@ -2270,7 +2270,7 @@ for experimenting with sound synthesis and algorithmic composition.
SuperCollider requires jackd to be installed in your user profile and your SuperCollider requires jackd to be installed in your user profile and your
user must be allowed to access the realtime features of the kernel. Search user must be allowed to access the realtime features of the kernel. Search
for \"realtime\" in the index of the Guix manual to learn how to achieve this for \"realtime\" in the index of the Guix manual to learn how to achieve this
using GuixSD.") using Guix System.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public raul (define-public raul

2
gnu/packages/curl.scm
View File

@ -108,7 +108,7 @@
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))
;; XXX FIXME: Test #1510 seems to work on some machines and not ;; XXX FIXME: Test #1510 seems to work on some machines and not
;; others, possibly based on the kernel version. It works on GuixSD ;; others, possibly based on the kernel version. It works on Guix System
;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686 ;; on x86_64 with linux-libre-4.1, but fails on Hydra for both i686
;; and x86_64 with the following error: ;; and x86_64 with the following error:
;; ;;

2
gnu/packages/emacs.scm
View File

@ -92,7 +92,7 @@
'("eshell/esh-groups.el"))) '("eshell/esh-groups.el")))
;; Make sure Tramp looks for binaries in the right places on ;; Make sure Tramp looks for binaries in the right places on
;; remote GuixSD machines, where 'getconf PATH' returns ;; remote Guix System machines, where 'getconf PATH' returns
;; something bogus. ;; something bogus.
(substitute* "net/tramp-sh.el" (substitute* "net/tramp-sh.el"
;; Patch the line after "(defcustom tramp-remote-path". ;; Patch the line after "(defcustom tramp-remote-path".

2
gnu/packages/gnome.scm
View File

@ -5161,7 +5161,7 @@ users.")
(doc (assoc-ref %outputs "doc")) (doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp") (dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
"/sbin/dhclient"))) "/sbin/dhclient")))
(list "--with-systemd-logind=yes" ;In GuixSD, this is provided by elogind. (list "--with-systemd-logind=yes" ;In Guix System, this is provided by elogind.
"--with-consolekit=no" "--with-consolekit=no"
"--with-crypto=gnutls" "--with-crypto=gnutls"
"--disable-config-plugin-ibft" "--disable-config-plugin-ibft"

2
gnu/packages/julia.scm
View File

@ -148,7 +148,7 @@
(use-modules (ice-9 match)) (use-modules (ice-9 match))
(substitute* "src/runtime_ccall.cpp" (substitute* "src/runtime_ccall.cpp"
;; Patch out invocations of '/sbin/ldconfig' to avoid getting ;; Patch out invocations of '/sbin/ldconfig' to avoid getting
;; error messages about missing '/sbin/ldconfig' on GuixSD. ;; error messages about missing '/sbin/ldconfig' on Guix System.
(("popen\\(.*ldconfig.*\\);") (("popen\\(.*ldconfig.*\\);")
"NULL;\n") "NULL;\n")

2
gnu/packages/kde-frameworks.scm
View File

@ -3487,7 +3487,7 @@ workspace.")
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qttools" ,qttools) ("qttools" ,qttools)
("qtx11extras" ,qtx11extras))) ("qtx11extras" ,qtx11extras)))
;; FIXME: Use GuixSD ca-bundle.crt in etc/xdg/ksslcalist and ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
;; share/kf5/kssl/ca-bundle.crt ;; share/kf5/kssl/ca-bundle.crt
;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include" ;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include"
;; into "@dev@/include/". Think about whether this is needed for us, too. ;; into "@dev@/include/". Think about whether this is needed for us, too.

6
gnu/packages/linux.scm
View File

@ -1112,7 +1112,7 @@ MIDI functionality to the Linux-based operating system.")
(outputs '("out" "pulseaudio" "jack")) (outputs '("out" "pulseaudio" "jack"))
(arguments (arguments
`(#:configure-flags '(;; Do not install a "local" configuration targeted `(#: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 ;; the ALSA service, and other distributions likely
;; won't use these files. ;; won't use these files.
"--with-alsalconfdir=/tmp/noop") "--with-alsalconfdir=/tmp/noop")
@ -1579,7 +1579,7 @@ devices. It replaces @code{iwconfig}, which is deprecated.")
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; TODO: Patch some hardcoded "wlan0" in calibrate/calibrate.cpp to ;; 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 (add-after 'unpack 'patch-absolute-file-names
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((kmod (assoc-ref inputs "kmod"))) (let ((kmod (assoc-ref inputs "kmod")))
@ -2379,7 +2379,7 @@ compliance.")
#:tests? #f ;no tests #:tests? #f ;no tests
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:make-flags (let ((out (assoc-ref %outputs "out")))
(list (string-append "PREFIX=" 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_PUBKEY=/dev/null")
(string-append "DISTRO_PRIVKEY=/dev/null") (string-append "DISTRO_PRIVKEY=/dev/null")
(string-append "REGDB_PUBKEY=/dev/null") (string-append "REGDB_PUBKEY=/dev/null")

4
gnu/packages/package-management.scm
View File

@ -142,8 +142,8 @@
;; Set 'DOT_USER_PROGRAM' to the empty string so ;; Set 'DOT_USER_PROGRAM' to the empty string so
;; we don't keep a reference to Graphviz, whose ;; we don't keep a reference to Graphviz, whose
;; closure is pretty big (too big for the GuixSD ;; closure is pretty big (too big for the Guix
;; installation image.) ;; system installation image.)
"ac_cv_path_DOT_USER_PROGRAM=dot" "ac_cv_path_DOT_USER_PROGRAM=dot"
;; To avoid problems with the length of shebangs, ;; To avoid problems with the length of shebangs,

2
gnu/packages/polkit.scm
View File

@ -73,7 +73,7 @@
(substitute* "src/polkitbackend/polkitbackendjsauthority.cpp" (substitute* "src/polkitbackend/polkitbackendjsauthority.cpp"
(("systemd") "elogind")) (("systemd") "elogind"))
;; GuixSD's polkit service stores actions under ;; Guix System's polkit service stores actions under
;; /etc/polkit-1/actions. ;; /etc/polkit-1/actions.
(substitute* "src/polkitbackend/polkitbackendinteractiveauthority.c" (substitute* "src/polkitbackend/polkitbackendinteractiveauthority.c"
(("PACKAGE_DATA_DIR \"/polkit-1/actions\"") (("PACKAGE_DATA_DIR \"/polkit-1/actions\"")

2
gnu/packages/tex.scm
View File

@ -185,7 +185,7 @@
;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows, ;; ps2eps.pl uses the "gswin32c" ghostscript executable on Windows,
;; and the "gs" ghostscript executable on Unix. It detects Unix by ;; and the "gs" ghostscript executable on Unix. It detects Unix by
;; checking for the existence of the /usr/bin directory. Since ;; checking for the existence of the /usr/bin directory. Since
;; GuixSD does not have /usr/bin, it is also detected as Windows. ;; Guix System does not have /usr/bin, it is also detected as Windows.
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl" (substitute* "utils/ps2eps/ps2eps-src/bin/ps2eps.pl"
(("gswin32c") "gs")) (("gswin32c") "gs"))

2
gnu/services/base.scm
View File

@ -331,7 +331,7 @@ seconds after @code{SIGTERM} has been sent are terminated with
`(("fstab" ,(plain-file "fstab" `(("fstab" ,(plain-file "fstab"
(string-append (string-append
"\ "\
# This file was generated from your GuixSD configuration. Any changes # This file was generated from your Guix configuration. Any changes
# will be lost upon reboot or reconfiguration.\n\n" # will be lost upon reboot or reconfiguration.\n\n"
(string-join (map file-system->fstab-entry (string-join (map file-system->fstab-entry
file-systems) file-systems)

2
gnu/services/cups.scm
View File

@ -862,7 +862,7 @@ IPP specifications.")
(define* (create-self-signed-certificate-if-absent (define* (create-self-signed-certificate-if-absent
#:key private-key public-key (owner (getpwnam "root")) #:key private-key public-key (owner (getpwnam "root"))
(common-name (gethostname)) (common-name (gethostname))
(organization-name "GuixSD") (organization-name "Guix")
(organization-unit-name "Default Self-Signed Certificate") (organization-unit-name "Default Self-Signed Certificate")
(subject-parameters `(("CN" . ,common-name) (subject-parameters `(("CN" . ,common-name)
("O" . ,organization-name) ("O" . ,organization-name)

2
gnu/services/mail.scm
View File

@ -1485,7 +1485,7 @@ greyed out, instead of only later giving \"not selectable\" popup error.
(define* (create-self-signed-certificate-if-absent (define* (create-self-signed-certificate-if-absent
#:key private-key public-key (owner (getpwnam "root")) #:key private-key public-key (owner (getpwnam "root"))
(common-name (gethostname)) (common-name (gethostname))
(organization-name "GuixSD") (organization-name "Guix")
(organization-unit-name "Default Self-Signed Certificate") (organization-unit-name "Default Self-Signed Certificate")
(subject-parameters `(("CN" . ,common-name) (subject-parameters `(("CN" . ,common-name)
("O" . ,organization-name) ("O" . ,organization-name)

2
gnu/services/messaging.scm
View File

@ -461,7 +461,7 @@ about using the hashed backend. See also
(log (log
(maybe-string "*syslog") (maybe-string "*syslog")
"Set logging options. Advanced logging configuration is not yet supported "Set logging options. Advanced logging configuration is not yet supported
by the GuixSD Prosody Service. See @url{https://prosody.im/doc/logging}." by the Prosody service. See @url{https://prosody.im/doc/logging}."
common) common)
(pidfile (pidfile

2
gnu/system/examples/vm-image.tmpl
View File

@ -8,7 +8,7 @@
(define vm-image-motd (plain-file "motd" " (define vm-image-motd (plain-file "motd" "
This is the GNU system. Welcome! This is the GNU system. Welcome!
This instance of GuixSD is a bare-bones template for virtualized environments. This instance of Guix System is a bare-bones template for virtualized environments.
You will probably want to do these things first if you booted in a virtual You will probably want to do these things first if you booted in a virtual
private server (VPS): private server (VPS):

2
gnu/system/install.scm
View File

@ -353,7 +353,7 @@ You have been warned. Thanks for being so brave.\x1b[0m
;; the appropriate one. ;; the appropriate one.
(cons* (file-system (cons* (file-system
(mount-point "/") (mount-point "/")
(device (file-system-label "GuixSD_image")) (device (file-system-label "Guix_image"))
(type "ext4")) (type "ext4"))
;; Make /tmp a tmpfs instead of keeping the overlayfs. This ;; Make /tmp a tmpfs instead of keeping the overlayfs. This

4
gnu/system/mapped-devices.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
@ -120,7 +120,7 @@
DEVICE must be a \"/dev\" file name." DEVICE must be a \"/dev\" file name."
(define aliases (define aliases
;; Attempt to load 'modules.alias' from the current kernel, assuming we're ;; Attempt to load 'modules.alias' from the current kernel, assuming we're
;; on GuixSD, and assuming that corresponds to the kernel we'll be ;; on Guix System, and assuming that corresponds to the kernel we'll be
;; installing. Skip the whole thing if that file cannot be read. ;; installing. Skip the whole thing if that file cannot be read.
(catch 'system-error (catch 'system-error
(lambda () (lambda ()

6
gnu/system/vm.scm
View File

@ -463,8 +463,8 @@ the image."
"Build a docker image. OS is the desired <operating-system>. NAME is the "Build a docker image. OS is the desired <operating-system>. NAME is the
base name to use for the output file. When REGISTER-CLOSURES? is not #f, base name to use for the output file. When REGISTER-CLOSURES? is not #f,
register the closure of OS with Guix in the resulting Docker image. This only register the closure of OS with Guix in the resulting Docker image. This only
makes sense when you want to build a GuixSD Docker image that has Guix makes sense when you want to build a Guix System Docker image that has Guix
installed inside of it. If you don't need Guix (e.g., your GuixSD Docker installed inside of it. If you don't need Guix (e.g., your Docker
image just contains a web server that is started by the Shepherd), then you image just contains a web server that is started by the Shepherd), then you
should set REGISTER-CLOSURES? to #f." should set REGISTER-CLOSURES? to #f."
(define schema (define schema
@ -610,7 +610,7 @@ to USB sticks meant to be read-only."
(define root-label (define root-label
;; Volume name of the root file system. ;; Volume name of the root file system.
(normalize-label "GuixSD_image")) (normalize-label "Guix_image"))
(define root-uuid (define root-uuid
;; UUID of the root file system, computed in a deterministic fashion. ;; UUID of the root file system, computed in a deterministic fashion.

4
gnu/tests/install.scm
View File

@ -47,7 +47,7 @@
;;; Commentary: ;;; Commentary:
;;; ;;;
;;; Test the installation of GuixSD using the documented approach at the ;;; Test the installation of Guix using the documented approach at the
;;; command line. ;;; command line.
;;; ;;;
;;; Code: ;;; Code:
@ -204,7 +204,7 @@ reboot\n")
(guix combinators)))) (guix combinators))))
(installation-disk-image-file-system-type "ext4") (installation-disk-image-file-system-type "ext4")
(target-size (* 2200 MiB))) (target-size (* 2200 MiB)))
"Run SCRIPT (a shell script following the GuixSD installation procedure) in "Run SCRIPT (a shell script following the system installation procedure) in
OS to install TARGET-OS. Return a VM image of TARGET-SIZE bytes containing OS to install TARGET-OS. Return a VM image of TARGET-SIZE bytes containing
the installed system. The packages specified in PACKAGES will be appended to the installed system. The packages specified in PACKAGES will be appended to
packages defined in installation-os." packages defined in installation-os."

4
guix/modules.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -112,7 +112,7 @@ depends on."
".scm")) ".scm"))
(define (guix-module-name? name) (define (guix-module-name? name)
"Return true if NAME (a list of symbols) denotes a Guix or GuixSD module." "Return true if NAME (a list of symbols) denotes a Guix module."
(match name (match name
(('guix _ ...) #t) (('guix _ ...) #t)
(('gnu _ ...) #t) (('gnu _ ...) #t)

2
nix/libstore/optimise-store.cc
View File

@ -114,7 +114,7 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHa
/* Sometimes SNAFUs can cause files in the store to be /* Sometimes SNAFUs can cause files in the store to be
modified, in particular when running programs as root under modified, in particular when running programs as root under
GuixSD (example: $fontconfig/var/cache being modified). Skip Guix System (example: $fontconfig/var/cache being modified). Skip
those files. FIXME: check the modification time. */ those files. FIXME: check the modification time. */
if (S_ISREG(st.st_mode) && (st.st_mode & S_IWUSR)) { if (S_ISREG(st.st_mode) && (st.st_mode & S_IWUSR)) {
printMsg(lvlError, format("skipping suspicious writable file `%1%'") % path); printMsg(lvlError, format("skipping suspicious writable file `%1%'") % path);