From 0caf53238c00ba657709ecd2d9362b52aa18a9d6 Mon Sep 17 00:00:00 2001
From: Benjamin Gilbert <bgilbert@redhat.com>
Date: Fri, 14 Oct 2022 01:39:45 -0400
Subject: [PATCH] Build with mbrman 0.5.0

---
 mbrman-0.5.0.patch         | 19 +++++++++++++++++++
 rust-coreos-installer.spec |  9 ++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 mbrman-0.5.0.patch

diff --git a/mbrman-0.5.0.patch b/mbrman-0.5.0.patch
new file mode 100644
index 0000000..25bc02d
--- /dev/null
+++ b/mbrman-0.5.0.patch
@@ -0,0 +1,19 @@
+--- coreos-installer-0.16.1/Cargo.toml.old	2022-10-14 01:32:13.064282069 -0400
++++ coreos-installer-0.16.1/Cargo.toml	2022-10-14 01:32:44.416313454 -0400
+@@ -199,4 +199,3 @@ rdcore = []
+ [target."cfg(target_arch = \"s390x\")".dependencies.mbrman]
+-version = ">= 0.3, < 0.5"
+-default-features = false
++version = ">= 0.5, < 0.6"
+ 
+--- a/src/s390x/fba.rs
++++ b/src/s390x/fba.rs
+@@ -39,7 +39,7 @@ pub(crate) fn fba_make_partitions(
+             length: blocks * bytes_per_block as u64,
+         });
+         mbr[idx + 1] = MBRPartitionEntry {
+-            boot: false,
++            boot: mbrman::BOOT_INACTIVE,
+             first_chs: CHS::empty(),
+             sys: 0x83, // MBR_LINUX_DATA_PARTITION
+             last_chs: CHS::empty(),
diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec
index dd16fbb..6d137e3 100644
--- a/rust-coreos-installer.spec
+++ b/rust-coreos-installer.spec
@@ -12,7 +12,7 @@
 
 Name:           rust-%{crate}
 Version:        0.16.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Installer for Fedora CoreOS and RHEL CoreOS
 
 # Upstream license specification: Apache-2.0
@@ -23,6 +23,10 @@ Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{
 Source1:        https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
 Source2:        https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz
 
+# Build with mbrman 0.5.x
+# https://github.com/coreos/coreos-installer/pull/1019
+Patch0:         mbrman-0.5.0.patch
+
 ExclusiveArch:  %{rust_arches}
 %if 0%{?rhel} && !0%{?eln}
 BuildRequires:  rust-toolset
@@ -181,6 +185,9 @@ from the initramfs.
 %endif
 
 %changelog
+* Fri Oct 14 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.16.1-2
+- Build with mbrman 0.5.0
+
 * Mon Sep 19 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.16.1-1
 - New release
 - Sync coreos-installer-dracut with CentOS Stream 9