From 0dd48252dcd372a6b8bbca961e911e93e7536111 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 16:15:43 +0000
Subject: import dmraid-1.0.0.rc16-26.el7


---

diff --git a/SOURCES/dmraid-activation.service b/SOURCES/dmraid-activation.service
index 4e10e25..e0e3b4b 100644
--- a/SOURCES/dmraid-activation.service
+++ b/SOURCES/dmraid-activation.service
@@ -7,7 +7,7 @@ Before=lvm2-activation-early.service cryptsetup.target local-fs.target shutdown.
 Wants=systemd-udev-settle.service
 
 [Service]
-ExecStart=/lib/systemd/fedora-dmraid-activation
+ExecStart=/lib/systemd/rhel-dmraid-activation
 Type=oneshot
 
 [Install]
diff --git a/SOURCES/fedora-dmraid-activation b/SOURCES/fedora-dmraid-activation
deleted file mode 100644
index 528adba..0000000
--- a/SOURCES/fedora-dmraid-activation
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Activation of dmraid sets.
-#
-. /etc/init.d/functions
-
-[ -z "${cmdline}" ] && cmdline=$(cat /proc/cmdline)
-
-if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then
-	modprobe dm-mirror >/dev/null 2>&1
-	dmraidsets=$(LC_ALL=C /sbin/dmraid -s -c -i)
-	if [ "$?" = "0" ]; then
-		SAVEIFS=$IFS
-		IFS=$(echo -en "\n\b")
-		for dmname in $dmraidsets; do
-			if [[ "$dmname" == isw_* ]] && \
-			   ! strstr "$cmdline" noiswmd; then
-				continue
-			fi
-			/sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1
-			/sbin/kpartx -u -a "/dev/mapper/$dmname"
-		done
-		IFS=$SAVEIFS
-	fi
-fi
diff --git a/SOURCES/rhel-dmraid-activation b/SOURCES/rhel-dmraid-activation
new file mode 100644
index 0000000..528adba
--- /dev/null
+++ b/SOURCES/rhel-dmraid-activation
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Activation of dmraid sets.
+#
+. /etc/init.d/functions
+
+[ -z "${cmdline}" ] && cmdline=$(cat /proc/cmdline)
+
+if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then
+	modprobe dm-mirror >/dev/null 2>&1
+	dmraidsets=$(LC_ALL=C /sbin/dmraid -s -c -i)
+	if [ "$?" = "0" ]; then
+		SAVEIFS=$IFS
+		IFS=$(echo -en "\n\b")
+		for dmname in $dmraidsets; do
+			if [[ "$dmname" == isw_* ]] && \
+			   ! strstr "$cmdline" noiswmd; then
+				continue
+			fi
+			/sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1
+			/sbin/kpartx -u -a "/dev/mapper/$dmname"
+		done
+		IFS=$SAVEIFS
+	fi
+fi
diff --git a/SPECS/dmraid.spec b/SPECS/dmraid.spec
index ad0400b..57585d7 100644
--- a/SPECS/dmraid.spec
+++ b/SPECS/dmraid.spec
@@ -7,7 +7,7 @@
 Summary: dmraid (Device-mapper RAID tool and library)
 Name: dmraid
 Version: 1.0.0.rc16
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
@@ -24,7 +24,7 @@ Requires(post): systemd >= 195-4
 Obsoletes: dmraid-libs < %{version}-%{release}
 Provides: dmraid-libs = %{version}-%{release}
 Source0: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2
-Source1: fedora-dmraid-activation
+Source1: rhel-dmraid-activation
 Source2: dmraid-activation.service
 
 Patch0: dmraid-1.0.0.rc16-test_devices.patch
@@ -137,7 +137,7 @@ install -m 0700 /dev/null $RPM_BUILD_ROOT/var/cache/logwatch/dmeventd/syslogpatt
 # Install systemd unit
 install -d ${RPM_BUILD_ROOT}/%{_prefix}/lib/systemd
 install -d ${RPM_BUILD_ROOT}/%{_unitdir}
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/fedora-dmraid-activation
+install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/lib/systemd/rhel-dmraid-activation
 install -m 444 %{SOURCE2} $RPM_BUILD_ROOT/%{_unitdir}/dmraid-activation.service
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libdmraid.a
@@ -161,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/dmraid.static
 %{_libdir}/libdmraid.so*
 %{_libdir}/libdmraid-events-isw.so*
-%{_prefix}/lib/systemd/fedora-dmraid-activation
+%{_prefix}/lib/systemd/rhel-dmraid-activation
 %{_unitdir}/dmraid-activation.service
 %ghost /var/lock/dmraid
 
@@ -188,6 +188,9 @@ rm -rf $RPM_BUILD_ROOT
 %ghost /var/cache/logwatch/dmeventd/syslogpattern.txt
 
 %changelog
+* Thu Sep 10 2015 Peter Rajnoha <prajnoha@redhat.com> - 1.0.0.rc16-26
+- Rename /usr/lib/systemd/fedora-dmraid-activaton to rhel-dmraid-activation.
+
 * Wed Jun 18 2014 Heinz Mauelshagen  <heinzm@redhat.com> - 1.0.0.rc16-25
 - Resolves: bz#1073134 (fix library path names)