Hello community,
here is the log from the commit of package mdadm for openSUSE:Factory checked
in at 2012-09-25 10:41:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mdadm (Old)
and /work/SRC/openSUSE:Factory/.mdadm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mdadm", Maintainer is "nfbr...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes 2012-08-22
14:37:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mdadm.new/mdadm.changes 2012-09-25
10:41:40.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Sep 20 06:03:45 UTC 2012 - nfbr...@suse.com
+
+- mdmon-takeover.fix
+ find-free-devnum.fix
+ mapfile-rebuild.fix
+ udev-offroot
+ Fix various issues will installation on IMSM
+ RAID arrays, booting from those arrays, and
+ clean shutdown when such an array is used for '/'.
+ (bnc#752107 bnc#732294 bnc#770351)
+
+- mkinitrd-setup.sh: allow use stable md device name
+ and allow it to have a ':' in it. (bnc#779087)
+
+- boot.md: make sure udev-trigger runs before
+ boot.md. (bnc#772286)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mdadm.spec ++++++
--- /var/tmp/diff_new_pack.xQBwSE/_old 2012-09-25 10:41:42.000000000 +0200
+++ /var/tmp/diff_new_pack.xQBwSE/_new 2012-09-25 10:41:42.000000000 +0200
@@ -81,8 +81,6 @@
install -m 755 %{S:7} $RPM_BUILD_ROOT/etc/cron.daily/mdadm
install -m 644 %{S:2} $RPM_BUILD_ROOT%{_var}/adm/fillup-templates/
ln -sf ../../etc/init.d/mdadmd $RPM_BUILD_ROOT/%{_sbindir}/rcmdadmd
-rm -rf $RPM_BUILD_ROOT/run/mdadm
-mkdir -p $RPM_BUILD_ROOT/run/mdadm
install -d $RPM_BUILD_ROOT/lib/udev/rules.d
install -m 644 udev-md-raid.rules
$RPM_BUILD_ROOT/lib/udev/rules.d/64-md-raid.rules
install -d $RPM_BUILD_ROOT/lib/systemd/system-shutdown
@@ -98,9 +96,6 @@
fi
%{fillup_and_insserv -y boot.md}
-# If /run/mdadm is already a symlink, this will fail and will have
-# to wait for next boot.
-mkdir -p /run/mdadm || true
%postun
%restart_on_update mdadmd
@@ -131,7 +126,6 @@
%dir /lib/udev/devices
%{_sbindir}/*
%{_var}/adm/fillup-templates/sysconfig.mdadm
-%ghost /run/mdadm
%dir /lib/mkinitrd
%dir /lib/mkinitrd/scripts
/lib/mkinitrd/scripts/setup-md.sh
++++++ boot.md ++++++
--- /var/tmp/diff_new_pack.xQBwSE/_old 2012-09-25 10:41:42.000000000 +0200
+++ /var/tmp/diff_new_pack.xQBwSE/_new 2012-09-25 10:41:42.000000000 +0200
@@ -23,7 +23,7 @@
# Provides: boot.md
# Required-Start: boot.udev boot.rootfsck
# Required-Stop: $null
-# Should-Start: boot.scsidev boot.multipath
+# Should-Start: boot.scsidev boot.multipath udev-trigger
# Should-Stop: boot.scsidev boot.multipath
# Default-Start: B
# Default-Stop:
++++++ mkinitrd-setup.sh ++++++
--- /var/tmp/diff_new_pack.xQBwSE/_old 2012-09-25 10:41:42.000000000 +0200
+++ /var/tmp/diff_new_pack.xQBwSE/_new 2012-09-25 10:41:42.000000000 +0200
@@ -11,6 +11,7 @@
cont_list=
md_devs=
+declare -A md_conf
# blockdev contains real devices (/dev/X) for root, resume, journal, dumb
for bd in $blockdev ; do
is_part_dev=false
@@ -67,20 +68,20 @@
;;
/dev/*)
mdconf="$(mdadm -Db "$container")\\n$mdconf"
- cont_list="$cont_list $container"
+ cont_list="$cont_list $container"
;;
[0-9a-f]*[0-9a-f])
if test -z "$mdadm_conf"; then
mdadm_conf=$(mdadm --examine --brief --scan)
fi
mdconf="$(echo "$mdadm_conf" | grep "UUID=$container")\\n$mdconf"
- cont_list="$cont_list $container"
+ cont_list="$cont_list $container"
;;
*)
echo "unrecognized container for $md_dev: $container"
;;
esac
- eval md_conf_${md_dev}=\"$mdconf\"
+ md_conf["$md_dev"]="$mdconf"
root_md=1
done
@@ -91,7 +92,7 @@
need_mdadm=1
echo "AUTO -all" > $tmp_mnt/etc/mdadm.conf
for md in $md_devs; do
- eval echo -e \"\$md_conf_$md\" >> $tmp_mnt/etc/mdadm.conf
+ echo "${md_conf["$md"]}" >> $tmp_mnt/etc/mdadm.conf
done
fi
# Remember which arrays are needed for the root or swap device and assemble
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
