rpm/mdadm
SHA256
1
0
Fork 0
forked from pool/mdadm
Code Pull Requests Activity

- remove /lib/udev/devices from specfile as it is

Browse Source 
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
This commit is contained in:
Neil Brown 2012-10-09 03:37:26 +00:00 committed by Git OBS Bridge
parent 0927375b35
commit 6c3ee769b5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mdadm.changes
View File

@ -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 Thu Sep 20 06:03:45 UTC 2012 - nfbrown@suse.com

4
mdadm.spec
View File

@ -72,7 +72,6 @@ sgml2txt Software-RAID.HOWTO.sgml
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_var}/adm/fillup-templates install -d $RPM_BUILD_ROOT%{_var}/adm/fillup-templates
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/init.d} 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 -m 755 %{S:4} %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/
install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts
install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-md.sh 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 Software-RAID.HOWTO/Software-RAID.HOWTO*{.txt,.html}
%doc %{_mandir}/man?/* %doc %{_mandir}/man?/*
/sbin/* /sbin/*
%dir /lib/udev
%dir /lib/udev/devices
%{_sbindir}/* %{_sbindir}/*
%{_var}/adm/fillup-templates/sysconfig.mdadm %{_var}/adm/fillup-templates/sysconfig.mdadm
%dir /lib/mkinitrd %dir /lib/mkinitrd
%dir /lib/mkinitrd/scripts %dir /lib/mkinitrd/scripts
/lib/mkinitrd/scripts/setup-md.sh /lib/mkinitrd/scripts/setup-md.sh
/lib/mkinitrd/scripts/boot-md.sh /lib/mkinitrd/scripts/boot-md.sh
%dir /lib/udev
%dir /lib/udev/rules.d %dir /lib/udev/rules.d
/lib/udev/rules.d/64-md-raid.rules /lib/udev/rules.d/64-md-raid.rules
%dir /etc %dir /etc

2
mkinitrd-setup.sh
View File

@ -92,7 +92,7 @@ if [ -n "$root_md" ] ; then
need_mdadm=1 need_mdadm=1
echo "AUTO -all" > $tmp_mnt/etc/mdadm.conf echo "AUTO -all" > $tmp_mnt/etc/mdadm.conf
for md in $md_devs; do 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 done
fi fi
# Remember which arrays are needed for the root or swap device and assemble # Remember which arrays are needed for the root or swap device and assemble