[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
102/104: etc: Install mount unit only if it exists.
From: |
guix-commits |
Subject: |
102/104: etc: Install mount unit only if it exists. |
Date: |
Sun, 17 May 2020 11:36:55 -0400 (EDT) |
nckx pushed a commit to branch core-updates
in repository guix.
commit eb02ba2d630779c20946bda212be23c714b7ac34
Author: Tobias Geerinckx-Rice <address@hidden>
AuthorDate: Sun May 17 14:09:43 2020 +0200
etc: Install mount unit only if it exists.
This follows up on 1a1faa78b0498fbb71f1533beb4b65817c1d3f2a, and avoids
the (non-fatal) error seen in <https://issues.guix.gnu.org/41356>.
/gnu/store will remain writable on new foreign distribution
installations until the next release.
* etc/guix-install.sh (sys_enable_guix_daemon): Check for
‘gnu-store.mount’ presence before trying to cp it.
Update forgotten copyright header.
---
etc/guix-install.sh | 11 +++++++----
nix/local.mk | 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index d252c13..bcce1d8 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -3,7 +3,7 @@
# Copyright © 2017 sharlatan <address@hidden>
# Copyright © 2018 Ricardo Wurmus <address@hidden>
# Copyright © 2018 Efraim Flashner <address@hidden>
-# Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
+# Copyright © 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
#
# This file is part of GNU Guix.
#
@@ -344,9 +344,12 @@ sys_enable_guix_daemon()
systemd)
{ # systemd .mount units must be named after the target directory.
# Here we assume a hard-coded name of /gnu/store.
- cp
"${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \
- /etc/systemd/system/;
- chmod 664 /etc/systemd/system/gnu-store.mount;
+ # XXX Work around <https://issues.guix.gnu.org/41356> until next
release.
+ if [ -f
"${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" ]; then
+ cp
"${ROOT_HOME}/.config/guix/current/lib/systemd/system/gnu-store.mount" \
+ /etc/systemd/system/;
+ chmod 664 /etc/systemd/system/gnu-store.mount;
+ fi
cp
"${ROOT_HOME}/.config/guix/current/lib/systemd/system/guix-daemon.service" \
/etc/systemd/system/;
diff --git a/nix/local.mk b/nix/local.mk
index 435fdd3..dbcdde8 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -1,6 +1,7 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès
<address@hidden>
# Copyright © 2016 Mathieu Lirzin <address@hidden>
+# Copyright © 2020 Tobias Geerinckx-Rice <address@hidden>
#
# This file is part of GNU Guix.
#
- 86/104: gnu: mumble: End phase with #t., (continued)
- 86/104: gnu: mumble: End phase with #t., guix-commits, 2020/05/17
- 89/104: gnu: java-xz: Remove duplicate definition., guix-commits, 2020/05/17
- 90/104: gnu: spiped: Update to 1.6.1., guix-commits, 2020/05/17
- 85/104: gnu: java-jmapviewer: Return #t from all phases., guix-commits, 2020/05/17
- 91/104: gnu: alpine: Update to 2.22., guix-commits, 2020/05/17
- 101/104: gnu: cups: Update to 2.3.3 [fixes CVE-2020-3898 & CVE-2019-8842]., guix-commits, 2020/05/17
- 103/104: gnu: cups, cups-minimal: Ungraft 2.3.3., guix-commits, 2020/05/17
- 104/104: gnu: cups-filters: Update to 1.27.4., guix-commits, 2020/05/17
- 87/104: gnu: julius: Update to 1.4.0., guix-commits, 2020/05/17
- 96/104: gnu: racket: Update to 7.7., guix-commits, 2020/05/17
- 102/104: etc: Install mount unit only if it exists.,
guix-commits <=
- 80/104: gnu: synthv1: Update to 0.9.14., guix-commits, 2020/05/17
- 94/104: doc: meson-build-system: Fix build type documentation., guix-commits, 2020/05/17
- 95/104: gnu: qemu-minimal: Use 'match' to find architecture., guix-commits, 2020/05/17
- 97/104: gnu: kdeconnect: Fix kdeconnectd path., guix-commits, 2020/05/17
- 98/104: gnu: acpica: Update to 20200430., guix-commits, 2020/05/17
- 99/104: gnu: acpica: Fix typo in synopsis., guix-commits, 2020/05/17
- 100/104: gnu: acpica: Drop Texinfo @dfn{} usage., guix-commits, 2020/05/17