diff options
Diffstat (limited to 'etc')
| -rwxr-xr-x | etc/guix-install.sh | 39 | ||||
| -rw-r--r-- | etc/teams.scm.in | 2 |
2 files changed, 16 insertions, 25 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh index 1949f00ed4..fc14471f1a 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -434,36 +434,27 @@ sys_enable_guix_daemon() _msg "${PAS}enabled Guix daemon via upstart" ;; systemd) - { # systemd .mount units must be named after the target directory. - # Here we assume a hard-coded name of /gnu/store. - # XXX Work around <https://issues.guix.gnu.org/41356> until next release. - if [ -f ~root/.config/guix/current/lib/systemd/system/gnu-store.mount ]; then - cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \ - /etc/systemd/system/; - chmod 664 /etc/systemd/system/gnu-store.mount; - systemctl daemon-reload && - systemctl enable gnu-store.mount; - fi - - cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \ - /etc/systemd/system/; - chmod 664 /etc/systemd/system/guix-daemon.service; - - # Work around <https://bugs.gnu.org/36074>, present in 1.0.1. - sed -i /etc/systemd/system/guix-daemon.service \ - -e "s/GUIX_LOCPATH='/'GUIX_LOCPATH=/"; + { install_unit() + { + local dest="/etc/systemd/system/$1" + rm -f "$dest" + cp ~root/.config/guix/current/lib/systemd/system/"$1" "$dest" + chmod 664 "$dest" + systemctl daemon-reload + systemctl enable "$1" + } - # Work around <https://bugs.gnu.org/35671>, present in 1.0.1. - if ! grep en_US /etc/systemd/system/guix-daemon.service >/dev/null; - then sed -i /etc/systemd/system/guix-daemon.service \ - -e 's/^Environment=\(.*\)$/Environment=\1 LC_ALL=en_US.UTF-8'; - fi; + install_unit guix-daemon.service configure_substitute_discovery \ /etc/systemd/system/guix-daemon.service + # Install after guix-daemon.service to avoid a harmless warning. + # systemd .mount units must be named after the target directory. + # Here we assume a hard-coded name of /gnu/store. + install_unit gnu-store.mount + systemctl daemon-reload && - systemctl enable guix-daemon && systemctl start guix-daemon; } && _msg "${PAS}enabled Guix daemon via systemd" ;; diff --git a/etc/teams.scm.in b/etc/teams.scm.in index 1e8ea95966..f041fab9ec 100644 --- a/etc/teams.scm.in +++ b/etc/teams.scm.in @@ -542,7 +542,7 @@ GLib/GIO, GTK, GStreamer and Webkit." r core mentors tex) (define-member (person "Christopher Baines" - "mail@cbaines.net") + "guix@cbaines.net") core mentors ruby) (define-member (person "Andrew Tropin" |