nixpkgs/pkgs/os-specific/linux/fuse/fuse3-install.patch
Matthew Bauer 5541559635 fuse3: use /etc/fuse.conf for configuration (#59043)
We don’t want the config file to be read only and in the Nix store.
2019-04-07 23:00:51 +02:00

45 lines
1.5 KiB
Diff

--- a/util/install_helper.sh 2018-08-31 21:22:34.580563286 +0200
+++ b/util/install_helper.sh 2018-08-31 21:30:54.837939149 +0200
@@ -22,30 +22,11 @@
DESTDIR="${DESTDIR%/}"
fi
-chown root:root "${DESTDIR}${bindir}/fusermount3"
-chmod u+s "${DESTDIR}${bindir}/fusermount3"
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/fuse.conf" \
"${DESTDIR}${sysconfdir}/fuse.conf"
-
-if test ! -e "${DESTDIR}/dev/fuse"; then
- mkdir -p "${DESTDIR}/dev"
- mknod "${DESTDIR}/dev/fuse" -m 0666 c 10 229
-fi
-
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
- "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
+ "${sysconfdir}/udev/rules.d/99-fuse3.rules"
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
"${DESTDIR}${sysconfdir}/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"
-fi
-
-
diff --git a/util/meson.build b/util/meson.build
index aa0e734..06d4378 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -1,4 +1,4 @@
-fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf')
+fuseconf_path = join_paths('/', get_option('sysconfdir'), 'fuse.conf')
executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'],
include_directories: include_dirs,