diff --git a/stratisd.spec b/stratisd.spec index 5592e87..c4ce1a4 100644 --- a/stratisd.spec +++ b/stratisd.spec @@ -10,7 +10,7 @@ Name: stratisd Version: 2.4.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Daemon that manages block devices to create filesystems # 0BSD or MIT or ASL 2.0 @@ -41,6 +41,7 @@ BuildRequires: pkgconfig(blkid) >= 2.32.0 BuildRequires: rust-packaging %endif BuildRequires: systemd +BuildRequires: dracut %{?systemd_requires} Requires: xfsprogs @@ -104,12 +105,12 @@ mv %{buildroot}%{udevdir}/stratis_utils %{buildroot}%{udevdir}/stratis-str-cmp ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage -mkdir -p %{buildroot}%{_unitdir}/system-generators -ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_unitdir}/system-generators/stratis-clevis-setup-generator -ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_unitdir}/system-generators/stratis-setup-generator +mkdir -p %{buildroot}%{_systemdgeneratordir} +ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/stratis-clevis-setup-generator +ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/stratis-setup-generator install -Dpm0755 -t %{buildroot}%{_bindir} target/release/stratis-min install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd-min -install -Dpm0755 -t %{buildroot}%{_usr}/lib/systemd systemd/stratis-fstab-setup +install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup %if %{with check} @@ -148,13 +149,16 @@ install -Dpm0755 -t %{buildroot}%{_usr}/lib/systemd systemd/stratis-fstab-setup %{dracutdir}/modules.d/90stratis/stratisd-min.service %{_unitdir}/stratisd-min-postinitrd.service %{_unitdir}/stratis-fstab-setup@.service -%{_unitdir}/system-generators/stratis-clevis-setup-generator -%{_unitdir}/system-generators/stratis-setup-generator +%{_systemdgeneratordir}/stratis-clevis-setup-generator +%{_systemdgeneratordir}/stratis-setup-generator %{_bindir}/stratis-min %{_libexecdir}/stratisd-min -%{_usr}/lib/systemd/stratis-fstab-setup +%{_systemd_util_dir}/stratis-fstab-setup %changelog +* Wed May 12 2021 John Baublitz - 2.4.0-3 +- Fix installed file paths + * Tue Apr 27 2021 mulhern - 2.4.0-2 - Fixes to previous release