From d5a36179aab42d73c3ae907e1aa9bb5476475863 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sat, 19 Jun 2021 04:27:11 +0000
Subject: [PATCH] import stratisd-2.4.2-1.el8

---
 .gitignore          |  4 ++--
 .stratisd.metadata  |  4 ++--
 SPECS/stratisd.spec | 55 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41b4a10..cb37d1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/stratisd-2.4.0-vendor.tar.gz
-SOURCES/stratisd-2.4.0.tar.gz
+SOURCES/stratisd-2.4.2-vendor.tar.gz
+SOURCES/stratisd-2.4.2.tar.gz
diff --git a/.stratisd.metadata b/.stratisd.metadata
index 748292c..c917657 100644
--- a/.stratisd.metadata
+++ b/.stratisd.metadata
@@ -1,2 +1,2 @@
-1f033350910365885cc2a4c5d9fe5772b3b748bf SOURCES/stratisd-2.4.0-vendor.tar.gz
-9f66a735aaa4129f0d0cf845e15fdd99209ae10b SOURCES/stratisd-2.4.0.tar.gz
+17524b817bc6fc65239fb11783cffe73d5796ca7 SOURCES/stratisd-2.4.2-vendor.tar.gz
+be4920dd54a84a7f2656e62c743740b90692b68c SOURCES/stratisd-2.4.2.tar.gz
diff --git a/SPECS/stratisd.spec b/SPECS/stratisd.spec
index 95dd943..05f02e8 100644
--- a/SPECS/stratisd.spec
+++ b/SPECS/stratisd.spec
@@ -6,8 +6,8 @@
 %global dracutdir %(pkg-config --variable=dracutdir dracut)
 
 Name:           stratisd
-Version:        2.4.0
-Release:        3%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        Daemon that manages block devices to create filesystems
 
 License:        MPLv2.0
@@ -33,11 +33,26 @@ Requires:       dbus-libs
 Requires:       cryptsetup >= 2.3.0
 
 Recommends:     clevis-luks >= 15
-Recommends:     dracut >= 049-136
 
 %description
 %{summary}.
 
+%package dracut
+
+
+Summary: Dracut modules for use with stratisd
+
+ExclusiveArch: ${rust_arches}
+
+Requires:     dracut >= 049-136
+Requires:     plymouth
+
+%description dracut
+
+This package contains dracut modules to be used with stratisd
+to enable using Stratis filesystems as the root filesystem for
+a Linux install.
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -45,17 +60,15 @@ Recommends:     dracut >= 049-136
 %cargo_prep -V 1
 
 %build
-%cargo_build
-%cargo_build  --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features min,systemd_compat
+%cargo_build --bin=stratisd
+%cargo_build --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features min,systemd_compat
 a2x -f manpage docs/stratisd.txt
 
 %install
-%cargo_install
 %{__install} -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf
 # Daemon should be really private
-mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}/developer_tools
-mv %{buildroot}%{_bindir}/stratisd %{buildroot}%{_libexecdir}/stratisd
+%{__install} -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd
 %{__install} -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8
 %{__install} -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/61-stratisd.rules
 %{__install} -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratisd.service
@@ -72,9 +85,10 @@ mkdir -p %{buildroot}%{dracutdir}/modules.d/90stratis-clevis
 %{__install} -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratis-fstab-setup\@.service
 
 mkdir -p %{buildroot}%{udevdir}
-mv %{buildroot}%{_bindir}/stratis-utils %{buildroot}%{udevdir}/stratis_utils
-mv %{buildroot}%{udevdir}/stratis_utils %{buildroot}%{udevdir}/stratis-str-cmp
+cp target/release/stratis-utils target/release/stratis-str-cmp
+%{__install} -Dpm0755 -t %{buildroot}%{udevdir} target/release/stratis-str-cmp
 ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode
+mkdir -p %{buildroot}%{_bindir}
 ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage
 mkdir -p %{buildroot}%{_systemdgeneratordir}
 ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/stratis-clevis-setup-generator
@@ -110,6 +124,14 @@ ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/st
 %{udevdir}/stratis-str-cmp
 %{udevdir}/stratis-base32-decode
 %{_bindir}/stratis-predict-usage
+%{_unitdir}/stratisd-min-postinitrd.service
+%{_unitdir}/stratis-fstab-setup@.service
+%{_bindir}/stratis-min
+%{_libexecdir}/stratisd-min
+%{_usr}/lib/systemd/stratis-fstab-setup
+
+%files dracut
+%license LICENSE
 %{dracutdir}/dracut.conf.d/90-stratis.conf
 %{dracutdir}/modules.d/90stratis-clevis/module-setup.sh
 %{dracutdir}/modules.d/90stratis-clevis/stratis-clevis-rootfs-setup
@@ -117,16 +139,17 @@ ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_systemdgeneratordir}/st
 %{dracutdir}/modules.d/90stratis/module-setup.sh
 %{dracutdir}/modules.d/90stratis/stratis-rootfs-setup
 %{dracutdir}/modules.d/90stratis/stratisd-min.service
-%{_unitdir}/stratisd-min-postinitrd.service
-%{_unitdir}/stratis-fstab-setup@.service
 %{_systemdgeneratordir}/stratis-clevis-setup-generator
 %{_systemdgeneratordir}/stratis-setup-generator
-%{_bindir}/stratis-min
-%{_libexecdir}/stratisd-min
-%{_usr}/lib/systemd/stratis-fstab-setup
-
 
 %changelog
+* Wed Jun 02 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.2-1
+- Update to 2.4.2
+- Resolves: rhbz#1931671
+- Ensure that binaries are installed with proper features enabled
+- Split dracut modules out to subpackage
+- Add additional dependencies in dracut module
+
 * Wed May 12 2021  Bryan Gurney <bgurney@redhat.com> - 2.4.0-3
 - Update to 2.4.0
 - Resolves: rhbz#1931671