mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 11:22:58 +00:00
dd4f12ef27
https://github.com/libfuse/libfuse/blob/fuse-3.16.1/ChangeLog.rst#libfuse-3161-2023-08-08 One change can be expected to break some setups: - Unsupported mount options are no longer silently accepted [1] For example, sshfs built against the present libfuse 3.11.0, `$ sshfs 127.0.0.1:/home/test/testdir /home/test/sshfs_mnt -o atime` terminates successfully (with the mount point established), while when built against 3.16.1, it outputs the error message `fuse: unknown option(s): `-o atime'` and terminates with exit status 1.
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
--- a/util/install_helper.sh 2023-08-26 22:12:11.028651669 +0200
|
|
+++ b/util/install_helper.sh 2023-08-26 22:38:03.165058694 +0200
|
|
@@ -39,12 +39,12 @@
|
|
|
|
if [ "${udevrulesdir}" != "" ]; then
|
|
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
|
|
- "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
|
|
+ "${sysconfdir}${udevrulesdir}/99-fuse3.rules"
|
|
fi
|
|
|
|
if [ "$initscriptdir" != "" ]; then
|
|
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
|
|
- "${DESTDIR}${initscriptdir}/fuse3"
|
|
+ "${sysconfdir}${initscriptdir}/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
|
|
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,
|