diff -u dmraid-1.0.0.rc16/debian/dmraid-activate dmraid-1.0.0.rc16/debian/dmraid-activate --- dmraid-1.0.0.rc16/debian/dmraid-activate +++ dmraid-1.0.0.rc16/debian/dmraid-activate @@ -67,34 +67,8 @@ # At this point we have the required number of devs, or the user wants the # array brought up in degraded mode, except in the case of striped arrays. - # We need to know the root device for determining if the -Z flag can be used - # (see #533848 and LP: 392510) - if [ -z "$ROOT" ]; then - for x in $(cat /proc/cmdline); do - case $x in - root=*) - ROOT=${x#root=} - ;; - esac - done - case "$ROOT" in - LABEL=*) - ROOT=$(readlink -f /dev/disk/by-uuid/${ROOT#LABEL=}) - ;; - UUID=*) - ROOT=$(readlink -f /dev/disk/by-uuid/${ROOT#UUID=}) - ;; - esac - else - ROOT=$(readlink -f $ROOT) - fi - - if (echo $ROOT | grep -q $1) ; then - dmraid -i -ay -Z "$1" - else - dmraid -i -ay "$1" - fi - + + dmraid -i -ay -Z "$1" return $Return_Val } diff -u dmraid-1.0.0.rc16/debian/changelog dmraid-1.0.0.rc16/debian/changelog --- dmraid-1.0.0.rc16/debian/changelog +++ dmraid-1.0.0.rc16/debian/changelog @@ -1,3 +1,22 @@ +dmraid (1.0.0.rc16-4ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #681391), remaining changes: + - debian/dmraid-activate: Remove the special-casing of the root + device which breaks in many situations and leaves the raw devices + exposed. This was introduced in Debian to accommodate some broken + configurations which wanted to access "partitions" on the raid + raw devices. In Ubuntu, broken configurations has not been supported. + - debian/dmraid.postinst: Comment out "udevadm trigger" call in postinst + for now as it has severeconsequences when mountall is installed + (clears /tmp). If dmraid is installed, then presumably the important + system devices are up and one can be bothered with a reboot to take + the change into account. Let update-initramfs flag the system + as needing a reboot. + - Removed |change udev rule for dmraid-activate to prevent infinite udev + event loop (LP: #534743). + + -- Lorenzo De Liso Thu, 25 Nov 2010 14:43:17 +0100 + dmraid (1.0.0.rc16-4) unstable; urgency=low [ Modestas Vainius ] @@ -8,6 +27,30 @@ -- Giuseppe Iuculano Mon, 22 Nov 2010 13:02:29 +0100 +dmraid (1.0.0.rc16-3ubuntu2) lucid; urgency=low + + * Removed |change udev rule for dmraid-activate to prevent infinite udev + event loop (LP: #534743). + + -- Phillip Susi Wed, 07 Apr 2010 11:01:17 -0400 + +dmraid (1.0.0.rc16-3ubuntu1) lucid; urgency=low + + * Merge from debian testing. (LP: #503136) Remaining changes: + - debian/dmraid-activate: Remove the special-casing of the root + device which breaks in many situations and leaves the raw devices + exposed. This was introduced in Debian to accommodate some broken + configurations which wanted to access "partitions" on the raid + raw devices. In Ubuntu, broken configurations has not been supported. + - debian/dmraid.postinst: Comment out "udevadm trigger" call in postinst + for now as it has severeconsequences when mountall is installed + (clears /tmp). If dmraid is installed, then presumably the important + system devices are up and one canbe bothered with a reboot to take + the change into account. Let update-initramfs flag the system + as needing a reboot. + + -- Artur Rona Thu, 04 Feb 2010 21:34:22 +0100 + dmraid (1.0.0.rc16-3) unstable; urgency=low * [3bea125] debian/patches/20_fix_isw_sectors_calculation.patch: Fix @@ -48,6 +91,36 @@ -- Giuseppe Iuculano Sun, 01 Nov 2009 19:00:41 +0100 +dmraid (1.0.0.rc15-11ubuntu3) karmic; urgency=low + + * Update changelog entry and postinst to mention correct bug for the + 1.0.0.rc15-11ubuntu2 changes. + + -- Loïc Minier Tue, 06 Oct 2009 18:54:28 +0200 + +dmraid (1.0.0.rc15-11ubuntu2) karmic; urgency=low + + * Comment out "udevadm trigger" call in postinst for now as it has severe + consequences when mountall is installed (clears /tmp). If dmraid is + installed, then presumably the important system devices are up and one can + be bothered with a reboot to take the change into account. Let + update-initramfs flag the system as needing a reboot. LP: #444252. + + -- Loïc Minier Tue, 06 Oct 2009 17:54:44 +0200 + +dmraid (1.0.0.rc15-11ubuntu1) karmic; urgency=low + + * debian/dmraid-activate: Remove the special-casing of the root + device which breaks in many situations and leaves the raw devices + exposed. This was introduced in Debian to accommodate some broken + configurations which wanted to access "partitions" on the raid + raw devices. In Ubuntu, broken configurations has not been supported. + * debian/dmraid-activate: Add support for "nodmraid" boot option, which + prevents automatic detection and activation of dmraid arrays. Useful + for broken configurations... Picked from Debian git. (LP: #392510) + + -- Tormod Volden Fri, 25 Sep 2009 21:29:36 +0200 + dmraid (1.0.0.rc15-11) unstable; urgency=low * [ce4e2dc] 15_activate_multiple_raid_sets.patch: Continue onto all diff -u dmraid-1.0.0.rc16/debian/control dmraid-1.0.0.rc16/debian/control --- dmraid-1.0.0.rc16/debian/control +++ dmraid-1.0.0.rc16/debian/control @@ -1,7 +1,8 @@ Source: dmraid Section: admin Priority: optional -Maintainer: Giuseppe Iuculano +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Giuseppe Iuculano Uploaders: Luke Yelavich Standards-Version: 3.8.3 Build-Depends: debhelper (>= 7), libdevmapper-dev, libklibc-dev, libselinux1-dev, quilt (>= 0.40), autotools-dev diff -u dmraid-1.0.0.rc16/debian/dmraid.udev dmraid-1.0.0.rc16/debian/dmraid.udev --- dmraid-1.0.0.rc16/debian/dmraid.udev +++ dmraid-1.0.0.rc16/debian/dmraid.udev @@ -4,3 +4,3 @@ -SUBSYSTEM=="block", ACTION=="add|change", ENV{ID_TYPE}=="disk", ENV{ID_FS_USAGE}=="raid", KERNEL=="hd[a-z]|sd[a-z]", \ +SUBSYSTEM=="block", ACTION=="add", ENV{ID_TYPE}=="disk", ENV{ID_FS_USAGE}=="raid", KERNEL=="hd[a-z]|sd[a-z]", \ RUN+="/sbin/dmraid-activate %k" diff -u dmraid-1.0.0.rc16/debian/dmraid.postinst dmraid-1.0.0.rc16/debian/dmraid.postinst --- dmraid-1.0.0.rc16/debian/dmraid.postinst +++ dmraid-1.0.0.rc16/debian/dmraid.postinst @@ -8,8 +8,13 @@ if command -v update-initramfs >/dev/null 2>&1; then update-initramfs -u fi - # Activate existing arrays now. - udevadm trigger --subsystem-match=block --action=change + # Calling udevadm trigger on block devices with mountall installed can have + # severe consequences (clearing /tmp for instance); see LP #444252 and + # dups. Instead, let update-initramfs flag the system as needing a reboot. + # If you're here, your dmraid devices are probably working or you can be + # bothered with a reboot. + ## Activate existing arrays now. + #udevadm trigger --subsystem-match=block --action=change if [ -f /etc/init.d/dmraid ]; then update-rc.d -f dmraid remove