From 3665f779901e70baadb7655d7270929c98d4aa00 Mon Sep 17 00:00:00 2001
From: Julian Sikorski <belegdol@fedoraproject.org>
Date: Sun, 15 Dec 2019 11:36:15 +0100
Subject: [PATCH] Fix invalid substitution type error Resolves bz1740662,
 bz1749859

---
 mdadm.rules | 2 +-
 mdadm.spec  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mdadm.rules b/mdadm.rules
index e8907c3..682e9e8 100644
--- a/mdadm.rules
+++ b/mdadm.rules
@@ -25,7 +25,7 @@ ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="md_end"
 # anything here, just regular disks, and this also won't get any imsm
 # array members either)
 SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \
-	IMPORT{program}="/sbin/mdadm -I $env{DEVNAME} --export $devnode --offroot ${DEVLINKS}"
+	IMPORT{program}="/sbin/mdadm -I $env{DEVNAME} --export $devnode --offroot $${DEVLINKS}"
 SUBSYSTEM=="block", ACTION=="add", ENV{ID_FS_TYPE}=="linux_raid_member", \
 	ENV{MD_STARTED}=="*unsafe*", ENV{MD_FOREIGN}=="no", ENV{SYSTEMD_WANTS}+="mdadm-last-resort@$env{MD_DEVICE}.timer"
 SUBSYSTEM=="block", ACTION=="remove", ENV{ID_PATH}=="?*", \
diff --git a/mdadm.spec b/mdadm.spec
index fba0bbf..f4f6e10 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -1,7 +1,7 @@
 Name:        mdadm
 Version:     4.1
 %define subversion rc2
-Release:     rc2.0.5%{?dist}.1
+Release:     rc2.0.5%{?dist}.2
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
@@ -96,6 +96,10 @@ install -m644 %{SOURCE8} %{buildroot}/etc/libreport/events.d
 /etc/libreport/events.d/*
 
 %changelog
+* Sun Dec 15 2019 Julian Sikorski <belegdol@fedoraproject.org> - 4.1-rc2.0.5.2
+- Fix invalid substitution type error
+- Resolves bz1740662, bz1749859
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-rc2.0.5.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild