diff --git a/zfs-fuse-helper b/zfs-fuse-helper index 6d9b9a6..6833f24 100644 --- a/zfs-fuse-helper +++ b/zfs-fuse-helper @@ -4,7 +4,7 @@ . /etc/rc.d/init.d/functions prog="zfs-fuse" -exec="/usr/bin/$prog" +exec="/usr/sbin/$prog" config=/etc/sysconfig/$prog [ -e $config ] && . $config @@ -174,7 +174,7 @@ restart() { pool_status() { # run checks to determine if the service is running or use generic status - status $prog && /usr/bin/zpool status + status $prog && /usr/sbin/zpool status } pool_status_quiet() { diff --git a/zfs-fuse.init b/zfs-fuse.init index 808ede0..97200b5 100644 --- a/zfs-fuse.init +++ b/zfs-fuse.init @@ -21,7 +21,7 @@ . /etc/rc.d/init.d/functions prog="zfs-fuse" -exec="/usr/bin/$prog" +exec="/usr/sbin/$prog" config=/etc/sysconfig/$prog [ -e $config ] && . $config @@ -191,7 +191,7 @@ restart() { pool_status() { # run checks to determine if the service is running or use generic status - status $prog && /usr/bin/zpool status + status $prog && /usr/sbin/zpool status } pool_status_quiet() { diff --git a/zfs-fuse.scrub b/zfs-fuse.scrub index 9e72ed6..c6ec553 100644 --- a/zfs-fuse.scrub +++ b/zfs-fuse.scrub @@ -9,7 +9,7 @@ [ "$ZFS_WEEKLY_SCRUB" != "yes" ] && exit 0 -zpool=/usr/bin/zpool +zpool=/usr/sbin/zpool pools=`$zpool list -H | cut -f1` diff --git a/zfs-fuse.service b/zfs-fuse.service index 296e1a0..b5a5eee 100644 --- a/zfs-fuse.service +++ b/zfs-fuse.service @@ -5,8 +5,8 @@ After=syslog.target [Service] Type=forking PrivateTmp=False -ExecStart=/usr/bin/zfs-fuse-helper start -ExecStop=/usr/bin/zfs-fuse-helper stop +ExecStart=/usr/sbin/zfs-fuse-helper start +ExecStop=/usr/sbin/zfs-fuse-helper stop [Install] WantedBy=multi-user.target diff --git a/zfs-fuse.spec b/zfs-fuse.spec index 78ffa22..2ee90ab 100644 --- a/zfs-fuse.spec +++ b/zfs-fuse.spec @@ -1,7 +1,7 @@ %define _hardened_build 1 Name: zfs-fuse Version: 0.7.2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: ZFS ported to Linux FUSE License: CDDL URL: https://github.com/gordan-bobic/zfs-fuse @@ -20,6 +20,13 @@ BuildRequires: systemd Requires: fuse >= 2.7.4-1 # (2010 karsten@redhat.com) zfs-fuse doesn't have s390(x) implementations for atomic instructions ExcludeArch: s390 s390x aarch64 +# For compatibility for packages expecting slightly other locations +Provides: /sbin/zfs +Provides: /sbin/zpool +Provides: /sbin/zdb +Provides: /sbin/ztest +Provides: /sbin/zstreamdump +Provides: /sbin/mount.zfs %description ZFS is an advanced modern general-purpose filesystem from Sun @@ -52,16 +59,16 @@ scons debug=2 optim='%{optflags}' %install pushd src -scons debug=1 install install_dir=%{buildroot}%{_bindir} man_dir=%{buildroot}%{_mandir}/man8/ cfg_dir=%{buildroot}/%{_sysconfdir}/%{name} +scons debug=1 install install_dir=%{buildroot}%{_sbindir} man_dir=%{buildroot}%{_mandir}/man8/ cfg_dir=%{buildroot}/%{_sysconfdir}/%{name} install -Dp -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service install -Dp -m 0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/98-%{name}-scrub install -Dp -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name} -install -Dp -m 0755 %{SOURCE4} %{buildroot}%{_bindir}/zfs-fuse-helper +install -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}/zfs-fuse-helper %ifnarch aarch64 ppc64le #set stack not executable, BZ 911150 for i in zdb zfs zfs-fuse zpool ztest; do - /usr/bin/execstack -c %{buildroot}%{_bindir}/$i + /usr/bin/execstack -c %{buildroot}%{_sbindir}/$i done %endif @@ -94,14 +101,14 @@ rm -rf /var/lock/zfs %files %doc BUGS CHANGES contrib HACKING LICENSE README %doc README.NFS STATUS TESTING TODO -%{_bindir}/zdb -%{_bindir}/zfs -%{_bindir}/zfs-fuse -%{_bindir}/zfs-fuse-helper -%{_bindir}/zpool -%{_bindir}/zstreamdump -%{_bindir}/ztest -%{_bindir}/mount.zfs +%{_sbindir}/zdb +%{_sbindir}/zfs +%{_sbindir}/zfs-fuse +%{_sbindir}/zfs-fuse-helper +%{_sbindir}/zpool +%{_sbindir}/zstreamdump +%{_sbindir}/ztest +%{_sbindir}/mount.zfs %{_unitdir}/%{name}.service %{_sysconfdir}/cron.weekly/98-%{name}-scrub %config(noreplace) %{_sysconfdir}/sysconfig/%{name} @@ -113,6 +120,9 @@ rm -rf /var/lock/zfs %{_mandir}/man8/zstreamdump.8.gz %changelog +* Sun Jul 16 2017 Neal Gompa - 0.7.2.2-4 +- Move binaries to /usr/sbin for compatibility with other zfs implementations + * Tue Mar 14 2017 Jon Ciesla - 0.7.2.2-3 - Systemd cleanup