summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolaus Rath <Nikolaus@rath.org>2019-07-09 05:13:50 -0700
committerNikolaus Rath <Nikolaus@rath.org>2019-07-09 05:15:09 -0700
commita0b9cb9d7603d4eda3fdb18952a30c8d914fa85c (patch)
treef00ba965cc189bdcbb21060979dade1e176d23b4
parent4cfbc27d4ec1a18d42f08e704eafb1b7b37332a9 (diff)
downloadfuse-a0b9cb9d7603d4eda3fdb18952a30c8d914fa85c.tar.gz
Install init script in /etc/ instead of $sysconfdir
sysconfdir defaults to /usr/local/etc which is almost always the wrong choice. Fixes: #427
-rw-r--r--ChangeLog.rst6
-rwxr-xr-xutil/install_helper.sh4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst
index ce1648e..49b8e4f 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,3 +1,9 @@
+Unreleased Changes
+==================
+
+* The init script is now installed to /etc/ rather than /usr/local/etc
+ by default.
+
libfuse 3.6.1 (2019-06-13)
==========================
diff --git a/util/install_helper.sh b/util/install_helper.sh
index 30f6227..cb649a7 100755
--- a/util/install_helper.sh
+++ b/util/install_helper.sh
@@ -40,14 +40,14 @@ install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
"${DESTDIR}${udevrulesdir}/99-fuse3.rules"
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
- "${DESTDIR}${sysconfdir}/init.d/fuse3"
+ "${DESTDIR}/etc/init.d/fuse3"
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
/usr/sbin/update-rc.d fuse3 start 34 S . start 41 0 6 . || /bin/true
else
echo "== FURTHER ACTION REQUIRED =="
- echo "Make sure that your init system will start the ${sysconfdir}/init.d/fuse3 init script"
+ echo "Make sure that your init system will start the ${DESTDIR}/etc/init.d/fuse3 init script"
fi