also sprach martin f krafft <madduck@debian.org> [2005.05.21.1612 +0200]:
> Patch attached.
There must be a cure for this crap. Now they are attached.
--
.''`. martin f. krafft <madduck@debian.org>
: :' : proud Debian developer, admin, user, and author
`. `'`
`- Debian - when you have better things to do than fixing a system
Invalid/expired PGP subkeys? Use subkeys.pgp.net as keyserver!
"never underestimate the bandwidth of
a station wagon full of tapes careening down the highway."
-- andrew s. tanenbaum
diff -u mdadm-1.9.0/debian/mdadm.postinst mdadm-1.9.0/debian/mdadm.postinst
--- mdadm-1.9.0/debian/mdadm.postinst
+++ mdadm-1.9.0/debian/mdadm.postinst
@@ -48,9 +48,15 @@
db_stop
fi
+# remove S04 installed as a fix to #294404 as it does not work
+# we only remove the startup links if the previous version was 1.9.0-2.1 (the
+# one with the erroneous fix) and the S04 link exists to make sure that
+# chances are minimised to overwrite admin changes (even though this would
+# not affect woody upgraders)
if [ "$1" = "configure" ] && [ -n "$2" ] \
- && dpkg --compare-versions "$2" le "1.9.0-2";
-then
+ && dpkg --compare-versions "$2" eq "1.9.0-2.1" \
+ && test -L /etc/rcS.d/S04mdadm-raid;
+then
update-rc.d -f mdadm-raid remove
fi
diff -u mdadm-1.9.0/debian/rules mdadm-1.9.0/debian/rules
--- mdadm-1.9.0/debian/rules
+++ mdadm-1.9.0/debian/rules
@@ -53,7 +53,7 @@
# dh_installemacsen
# dh_installpam
# dh_installmime
- dh_installinit --init-script=mdadm-raid -- start 4 S . start 50 0 6 .
+ dh_installinit --init-script=mdadm-raid -- start 25 S . start 50 0 6 .
dh_installinit -- defaults 25
# dh_installcron
dh_installman
diff -u mdadm-1.9.0/debian/mdadm-raid mdadm-1.9.0/debian/mdadm-raid
--- mdadm-1.9.0/debian/mdadm-raid
+++ mdadm-1.9.0/debian/mdadm-raid
@@ -23,7 +23,12 @@
/sbin/modprobe -k md > /dev/null 2>&1
fi
test -f /proc/mdstat || exit 0
- echo "Starting raid devices: "
+ if [ -d /dev/.udevdb -a ! -e /dev/md0 -a ! -e /dev/md/0 ]; then
+ echo -n "Creating raid device nodes: "
+ cd /dev && WRITE_ON_UDEV=1 ./MAKEDEV md
+ echo "done."
+ fi
+ echo -n "Starting raid devices: "
if [ -f $CONFIG ] && [ -x $MDADM ] ; then
$MDADM -A -s
elif [ -x $MDRUN ] ; then
diff -u mdadm-1.9.0/debian/changelog mdadm-1.9.0/debian/changelog --- mdadm-1.9.0/debian/changelog +++ mdadm-1.9.0/debian/changelog @@ -1,3 +1,15 @@ +mdadm (1.9.0-2.2) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for sarge targetted RC bugfix. + * Move mdadm-raid back to S25 as it needs to run after modules have been + loaded at S20 (see followups to #294404, #301560). + * Added code suggested by Marco d'Itri (see #294404) to create /dev/md* + device nodes before running mdadm in mdadm-raid if not yet present, and if + udev is being used. + + -- martin f. krafft <madduck@debian.org> Sat, 21 May 2005 16:14:51 +0200 + mdadm (1.9.0-2.1) unstable; urgency=high * Non-maintainer upload.
Attachment:
signature.asc
Description: Digital signature