Hi,
Please consider an exception for dmraid 1.0.0.rc14-4, it fixes 2 RC bugs
(#494278, #499060)
dmraid (1.0.0.rc14-4) unstable; urgency=high
.
* debian/dmraid.postinst: Activate existing arrays once the package is
installed. (Closes: #498674). Thanks to Luke Yelavich <themuso@ubuntu.com>
* debian/patches/00list: Removed 07_isw-raid10-nested.dpatch, it breaks some
Intel raid1 system (Closes: #494278)
* debian/dmraid.udev: watershed isn't in udev package, removed from RUN
command
* Do not install useless usr/share/initramfs-tools/scripts/local-top
* debian/dmraid-activate: Don't take out any locks, added -i
(--ignorelocking) option in every dmraid command executed by
dmraid-activate, and do not use /usr/bin/basename, it is pointless and
breaks fakeraid detenction if /usr isn't mounted (Closes: 499060)
* debian/control: Removed lsb-base and added udev in dmraid Depends
These changes do not affect the udeb and the existing support of dmraid in the
installer.
The debdiff in attachment.
Giuseppe Iuculano.
diff -u dmraid-1.0.0.rc14/debian/dmraid.udev dmraid-1.0.0.rc14/debian/dmraid.udev
--- dmraid-1.0.0.rc14/debian/dmraid.udev
+++ dmraid-1.0.0.rc14/debian/dmraid.udev
@@ -6 +6 @@
- RUN+="watershed sh -c '/sbin/dmraid-activate %k'"
+ RUN+="/sbin/dmraid-activate %k"
diff -u dmraid-1.0.0.rc14/debian/dmraid.postinst dmraid-1.0.0.rc14/debian/dmraid.postinst
--- dmraid-1.0.0.rc14/debian/dmraid.postinst
+++ dmraid-1.0.0.rc14/debian/dmraid.postinst
@@ -8,7 +8,10 @@
if [ -x /usr/sbin/update-initramfs ]; then
/usr/sbin/update-initramfs -u
fi
-
+
+ # Activate existing arrays now.
+ udevadm trigger --subsystem-match=block --action=add
+
if [ -f /etc/init.d/dmraid ]; then
update-rc.d -f dmraid remove
rm -f /etc/init.d/dmraid
diff -u dmraid-1.0.0.rc14/debian/changelog dmraid-1.0.0.rc14/debian/changelog
--- dmraid-1.0.0.rc14/debian/changelog
+++ dmraid-1.0.0.rc14/debian/changelog
@@ -1,3 +1,20 @@
+dmraid (1.0.0.rc14-4) unstable; urgency=high
+
+ * debian/dmraid.postinst: Activate existing arrays once the package is
+ installed. (Closes: #498674). Thanks to Luke Yelavich <themuso@ubuntu.com>
+ * debian/patches/00list: Removed 07_isw-raid10-nested.dpatch, it breaks some
+ Intel raid1 system (Closes: #494278)
+ * debian/dmraid.udev: watershed isn't in udev package, removed from RUN
+ command
+ * Do not install useless usr/share/initramfs-tools/scripts/local-top
+ * debian/dmraid-activate: Don't take out any locks, added -i
+ (--ignorelocking) option in every dmraid command executed by
+ dmraid-activate, and do not use /usr/bin/basename, it is pointless and
+ breaks fakeraid detenction if /usr isn't mounted (Closes: 499060)
+ * debian/control: Removed lsb-base and added udev in dmraid Depends
+
+ -- Giuseppe Iuculano <giuseppe@iuculano.it> Sun, 21 Sep 2008 15:54:38 +0200
+
dmraid (1.0.0.rc14-3) unstable; urgency=low
* debian/patches/09_promise-add-offsets.dpatch: Added 974 disk offset
diff -u dmraid-1.0.0.rc14/debian/dmraid-activate dmraid-1.0.0.rc14/debian/dmraid-activate
--- dmraid-1.0.0.rc14/debian/dmraid-activate
+++ dmraid-1.0.0.rc14/debian/dmraid-activate
@@ -26,24 +26,24 @@
if [ "$1" = "--degraded" ]; then
Degraded=1
- Node_Name=$(basename $2)
+ Node_Name=$2
else
- Node_Name=$(basename $1)
+ Node_Name=$1
fi
-Raid_Name=$(dmraid -r -cr /dev/$Node_Name | grep -v "No RAID disks")
+Raid_Name=$(dmraid -i -r -cr /dev/$Node_Name | grep -v "No RAID disks")
if [ -z "$Raid_Name" ]; then
exit 0
fi
-Raid_Setinfo=$(dmraid -si $Raid_Name)
+Raid_Setinfo=$(dmraid -i -si $Raid_Name)
if [ -z "$Raid_Setinfo" ]; then
exit 0
fi
-Raid_Type=$(dmraid -si -ct $Raid_Name)
-Raid_Nodevs=$(dmraid -si -cd $Raid_Name)
+Raid_Type=$(dmraid -i -si -ct $Raid_Name)
+Raid_Nodevs=$(dmraid -i -si -cd $Raid_Name)
case "$Raid_Type" in
stripe)
@@ -74,3 +74,3 @@
-dmraid -ay $Raid_Name
+dmraid -i -ay $Raid_Name
diff -u dmraid-1.0.0.rc14/debian/control dmraid-1.0.0.rc14/debian/control
--- dmraid-1.0.0.rc14/debian/control
+++ dmraid-1.0.0.rc14/debian/control
@@ -10,7 +10,7 @@
Section: admin
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, lsb-base
+Depends: ${shlibs:Depends}, udev
Description: Device-Mapper Software RAID support tool
dmraid discovers, activates, deactivates and displays properties
of software RAID sets (eg, ATARAID) and contained DOS partitions.
diff -u dmraid-1.0.0.rc14/debian/rules dmraid-1.0.0.rc14/debian/rules
--- dmraid-1.0.0.rc14/debian/rules
+++ dmraid-1.0.0.rc14/debian/rules
@@ -85,7 +85,7 @@
dh_testroot
dh_install
dh_installudev --priority=85
- chmod 755 debian/dmraid/usr/share/initramfs-tools/hooks/dmraid debian/dmraid/usr/share/initramfs-tools/scripts/local-top/dmraid
+ chmod 755 debian/dmraid/usr/share/initramfs-tools/hooks/dmraid
chmod 755 debian/dmraid/sbin/dmraid-activate
dh_installchangelogs ${version}/CHANGELOG
dh_installdocs ${version}/CREDITS ${version}/KNOWN_BUGS ${version}/README ${version}/TODO
diff -u dmraid-1.0.0.rc14/debian/dmraid.install dmraid-1.0.0.rc14/debian/dmraid.install
--- dmraid-1.0.0.rc14/debian/dmraid.install
+++ dmraid-1.0.0.rc14/debian/dmraid.install
@@ -1,3 +1,2 @@
debian/initramfs/dmraid.initramfs-hook/dmraid usr/share/initramfs-tools/hooks
-debian/initramfs/dmraid.initramfs-local/dmraid usr/share/initramfs-tools/scripts/local-top
debian/dmraid-activate sbin
diff -u dmraid-1.0.0.rc14/debian/patches/00list dmraid-1.0.0.rc14/debian/patches/00list
--- dmraid-1.0.0.rc14/debian/patches/00list
+++ dmraid-1.0.0.rc14/debian/patches/00list
@@ -3,7 +3,6 @@
04_generate-uuids.dpatch
05_kernel-event-handling.dpatch
06_isw-metadata-fixes.dpatch
-07_isw-raid10-nested.dpatch
08_promise-metadata-fixes.dpatch
09_promise-add-offsets.dpatch
10_jmicron-name-fix.dpatch
Attachment:
signature.asc
Description: OpenPGP digital signature