From 6c3ee769b5ac47c09f5b128345e309467c17093f30ff971de63c975f6a9044b6 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Tue, 9 Oct 2012 03:37:26 +0000
Subject: [PATCH] - remove /lib/udev/devices from specfile as it is   unused -
 mkinitrd-setup.sh: fixed recent breakage for IMSM   arrays (bnc#783444)

OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=75
---
 mdadm.changes     | 8 ++++++++
 mdadm.spec        | 4 +---
 mkinitrd-setup.sh | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mdadm.changes b/mdadm.changes
index 09f51dd..2555704 100644
--- a/mdadm.changes
+++ b/mdadm.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct  9 03:35:22 UTC 2012 - nfbrown@suse.com
+
+- remove /lib/udev/devices from specfile as it is
+  unused
+- mkinitrd-setup.sh: fixed recent breakage for IMSM
+  arrays (bnc#783444)
+
 -------------------------------------------------------------------
 Thu Sep 20 06:03:45 UTC 2012 - nfbrown@suse.com
 
diff --git a/mdadm.spec b/mdadm.spec
index 1f4b852..9842a0a 100644
--- a/mdadm.spec
+++ b/mdadm.spec
@@ -72,7 +72,6 @@ sgml2txt Software-RAID.HOWTO.sgml
 make install DESTDIR=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_var}/adm/fillup-templates
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/init.d}
-install -d $RPM_BUILD_ROOT/lib/udev/devices
 install -m 755 %{S:4} %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
 install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
 install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-md.sh
@@ -122,14 +121,13 @@ rm -rf $RPM_BUILD_ROOT
 %doc Software-RAID.HOWTO/Software-RAID.HOWTO*{.txt,.html}
 %doc %{_mandir}/man?/*
 /sbin/*
-%dir /lib/udev
-%dir /lib/udev/devices
 %{_sbindir}/*
 %{_var}/adm/fillup-templates/sysconfig.mdadm
 %dir /lib/mkinitrd
 %dir /lib/mkinitrd/scripts
 /lib/mkinitrd/scripts/setup-md.sh
 /lib/mkinitrd/scripts/boot-md.sh
+%dir /lib/udev
 %dir /lib/udev/rules.d
 /lib/udev/rules.d/64-md-raid.rules
 %dir /etc
diff --git a/mkinitrd-setup.sh b/mkinitrd-setup.sh
index 1d4ba33..9bc4777 100644
--- a/mkinitrd-setup.sh
+++ b/mkinitrd-setup.sh
@@ -92,7 +92,7 @@ if [ -n "$root_md" ] ; then
     need_mdadm=1
     echo "AUTO -all" > $tmp_mnt/etc/mdadm.conf
     for md in $md_devs; do
-        echo "${md_conf["$md"]}" >> $tmp_mnt/etc/mdadm.conf
+        echo -e "${md_conf["$md"]}" >> $tmp_mnt/etc/mdadm.conf
     done
 fi
 # Remember which arrays are needed for the root or swap device and assemble