fix path to internally called fsadm

$ lvreduce -L 5G  -r /dev/vol/host
WARNING: Failed to connect to lvmetad. Falling back to device scanning.
/usr/sbin/fsadm: execvp failed: No such file or directory
Filesystem check failed.

seems other paths are fine:

$ grep _PATH config.status
D["LVM_PATH"]=" \"/sbin/lvm\""
D["CLVMD_PATH"]=" \"/usr/sbin/clvmd\""
D["FSADM_PATH"]=" \"/usr/sbin/fsadm\""
D["DMEVENTD_PATH"]=" \"/sbin/dmeventd\""

diff --git a/fsadm-path.patch b/fsadm-path.patch
new file mode 100644 (file)
index 0000000..f58f157
--- /dev/null
+++ b/fsadm-path.patch
@@ -0,0 +1,11 @@
+--- LVM2.2.02.173/configure.in~        2017-09-19 22:06:06.000000000 +0300
++++ LVM2.2.02.173/configure.in 2017-09-19 22:09:52.779696341 +0300
+@@ -1899,7 +1899,7 @@
+ AC_DEFINE_UNQUOTED(CLVMD_PATH, ["$CLVMD_PATH"], [Path to clvmd binary.])
+ 
+ 
+-FSADM_PATH="$lvm_exec_prefix/sbin/fsadm"
++FSADM_PATH="$sbindir/fsadm"
+ AC_DEFINE_UNQUOTED(FSADM_PATH, ["$FSADM_PATH"], [Path to fsadm binary.])
+ 
+ ################################################################################

diff --git a/lvm2.spec b/lvm2.spec
index 03f66e750d582994e16449be1baae2add24d9dd9..ee45189cafcdbbc22a034dc4dcc0e82fd8e0433d 100644 (file)
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -59,7 +59,7 @@ Summary:      The new version of Logical Volume Manager for Linux
 Summary(pl.UTF-8):     Nowa wersja Logical Volume Managera dla Linuksa
 Name:          lvm2
 Version:       2.02.173
-Release:       1
+Release:       2
 License:       GPL v2 and LGPL v2.1
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz
@@ -71,6 +71,7 @@ Patch1:               %{name}-diet.patch
 Patch2:                device-mapper-dmsetup-export.patch
 Patch3:                %{name}-pld_init.patch
 Patch4:                dl-dlsym.patch
+Patch5:                fsadm-path.patch
 Patch6:                %{name}-lvm_path.patch
 Patch7:                %{name}-sd_notify.patch
 Patch8:                %{name}-clvmd_cmd_timeout.patch
@@ -216,8 +217,8 @@ Group:              Daemons
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name} = %{version}-%{release}
 Requires:      python3-dbus
-Requires:      python3-pyudev
 Requires:      python3-pygobject3 >= 3
+Requires:      python3-pyudev
 
 %description dbusd
 Daemon for access to LVM2 functionality through a D-Bus interface.
@@ -232,8 +233,8 @@ Summary(pl.UTF-8):  Demon blokad LVM2
 Group:         Daemons
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name} = %{version}-%{release}
-%{?with_sanlock:Requires:      sanlock-libs >= 3.3.0}
 %{?with_cluster:Requires:      dlm-libs >= 3.99.5}
+%{?with_sanlock:Requires:      sanlock-libs >= 3.3.0}
 
 %description lockd
 LVM commands use lvmlockd to coordinate access to shared storage.
@@ -307,9 +308,9 @@ narzędzia do zarządzania logicznymi wolumenami.
 Summary:       Device-mapper shared libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone device-mappera
 Group:         Libraries
-Conflicts:     device-mapper < 2.02.119-1
 Requires:      libblkid >= 2.24
 Requires:      udev-libs >= 1:176
+Conflicts:     device-mapper < 2.02.119-1
 
 %description -n device-mapper-libs
 Device-mapper shared libraries.
@@ -396,6 +397,7 @@ potrzeby initrd.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1