In a previous life, on 11.09.2011 02:09, Philipp Kern wrote: > On Sun, Sep 11, 2011 at 01:09:35AM +0400, Michael Tokarev wrote: >> We'd like to upload a bugfix release of mdadm package for the >> next squeeze point release. There are mostly cosmetic changes, >> but some of the bugs are very annoying and already made quite >> some users unhappy - like the famous #598957, when mdadm monthly >> cron job generated useless email messages about i/o scheduling >> class for monthly array checks -- this bug alone prompted several >> NMU attempts already. > > See <4dbfa62f.1020...@debian.org> ff. We require changes to be in unstable > first. We really do. > > So fix "your" package in unstable, let it be tested, and we'll look at it. So > far all attempts have targetted stable only, which is the wrong approach.
So, after quite some time, I'm attempting another upload of mdadm to stable-pu. All the changes were sitting in testing for half a year, and were backported into stable/squeeze version. As before, the proposed changes are only in debian-specific areas of the package, fixing several bugs in supporting/maintenance scripts. Complete debdiff is attached. Can we proceed with the update this time? :) Thank you! /mjt
diff -Nru mdadm-3.1.4/debian/changelog mdadm-3.1.4/debian/changelog
--- mdadm-3.1.4/debian/changelog 2010-09-03 13:06:30.000000000 +0400
+++ mdadm-3.1.4/debian/changelog 2012-01-10 12:25:03.000000000 +0400
@@ -1,3 +1,28 @@
+mdadm (3.1.4-1+8efb9d1+squeeze1) stable; urgency=low
+
+ [ martin f. krafft ]
+ * Do not print io rescheduling info message when run by cron
+ (closes: #598957).
+ * Fix checkarray script so that it does not die after scheduling the first
+ device when there is no scheduling class specified; thanks to Mario
+ 'BitKoenig' Holbe (closes: #611627).
+ * Schedule start/stop of mdadm-raid before/after filesystems are
+ checked&mounted/unmounted; thanks to Mario 'BitKoenig' Holbe
+ (closes: #611632).
+ * Work around a shell coding bug for cases when there are zero active
+ devices (closes: #618561).
+ * Make mdadm-raid init script depend on hostname; thanks to Mario
+ 'BitKoenig' Holbe (closes: #610421).
+ * Schedule start/stop of mdadm-raid before/after filesystems are
+ checked&mounted/unmounted; thanks to Mario 'BitKoenig' Holbe
+ (closes: #611632).
+
+ [ Michael Tokarev ]
+ * don't print W: auto-read-only in checkarray in quiet mode,
+ thanks to Bernd Hanisch for the patch (Closes: #605722, #632797)
+
+ -- Michael Tokarev <m...@tls.msk.ru> Sat, 10 Sep 2011 00:32:52 +0400
+
mdadm (3.1.4-1+8efb9d1) unstable; urgency=low
* Added patch with Makefile fix from upstream (commit 8efb9d1) to fix
diff -Nru mdadm-3.1.4/debian/checkarray mdadm-3.1.4/debian/checkarray
--- mdadm-3.1.4/debian/checkarray 2010-09-03 12:44:09.000000000 +0400
+++ mdadm-3.1.4/debian/checkarray 2011-09-10 14:30:22.000000000 +0400
@@ -159,7 +159,7 @@
fi
if [ "$(cat /sys/block/$array/md/array_state)" = 'read-auto' ]; then
- echo "$PROGNAME: W: array $array in auto-read-only state, skipping..." >&2
+ [ $quiet -lt 1 ] && echo "$PROGNAME: W: array $array in auto-read-only
state, skipping..." >&2
continue
fi
@@ -185,7 +185,7 @@
low) arg='-c2 -n7';;
high) arg='-c2 -n0';;
realtime) arg='-c1 -n4';;
- *) break;;
+ *) continue;;
esac
resync_pid= wait=5
@@ -193,8 +193,8 @@
wait=$((wait - 1))
resync_pid=$(ps -ef | awk -v dev=$array 'BEGIN { pattern = "^\\[" dev
"_resync]$" } $8 ~ pattern { print $2 }')
if [ -n "$resync_pid" ]; then
- echo "$PROGNAME: I: selecting $ionice I/O scheduling class for
resync of $array." >&2
- ionice -p "$resync_pid" $arg
+ [ $quiet -lt 1 ] && echo "$PROGNAME: I: selecting $ionice I/O
scheduling class for resync of $array." >&2
+ ionice -p "$resync_pid" $arg || :
break
fi
sleep 1
diff -Nru mdadm-3.1.4/debian/mdadm-raid mdadm-3.1.4/debian/mdadm-raid
--- mdadm-3.1.4/debian/mdadm-raid 2010-09-03 12:44:09.000000000 +0400
+++ mdadm-3.1.4/debian/mdadm-raid 2012-01-10 12:21:44.000000000 +0400
@@ -8,10 +8,12 @@
#
### BEGIN INIT INFO
# Provides: mdadm-raid
-# Required-Start: mountkernfs
+# Required-Start: mountkernfs hostname
# Should-Start: udev devfsd
+# X-Start-Before: checkfs mountall
# Required-Stop: mountkernfs
# Should-Stop: udev devfsd
+# X-Stop-After: umountfs
# Default-Start: S
# Default-Stop: 0 6
# Short-Description: MD array assembly
@@ -172,6 +174,7 @@
log_action_begin_msg "Generating udev events for MD arrays"
for uevent in /sys/block/md*/uevent; do
+ test -e $uevent || break
sentinel=${uevent#/sys/block/}; sentinel=${sentinel%/uevent}-uevent
test -e ${STATEDIR:-/doesnotexist}/$sentinel && continue
test -w $uevent || continue
signature.asc
Description: OpenPGP digital signature
