[arch-commits] Commit in dmraid/trunk (PKGBUILD dmraid.install dmraid_hook)

[Tobias Powalowski]

    Date: Sunday, October 26, 2008 @ 17:16:09
  Author: tpowa
Revision: 17205

upgpkg: dmraid 1.0.0.rc15-5

Modified:
  dmraid/trunk/PKGBUILD
  dmraid/trunk/dmraid.install
  dmraid/trunk/dmraid_hook

----------------+
 PKGBUILD       |    4 ++--
 dmraid.install |   10 +---------
 dmraid_hook    |    8 +++++---
 3 files changed, 8 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-26 20:29:18 UTC (rev 17204)
+++ PKGBUILD	2008-10-26 21:16:09 UTC (rev 17205)
@@ -4,7 +4,7 @@
 
 pkgname=dmraid
 pkgver=1.0.0.rc15
-pkgrel=4
+pkgrel=5
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 depends=(device-mapper)
@@ -16,7 +16,7 @@
 install=dmraid.install
 md5sums=('2602887205a35f89b59eeba3a868150f'
          '8f8b6fb332fce85a27d72fc63385db70'
-         '8c944cab8c885192a90e518a8d794adf')
+         '60e095be004ce66771d56235c5f7be13')
 
 build() {
   cd $srcdir/$pkgname/$pkgver

Modified: dmraid.install
===================================================================
--- dmraid.install	2008-10-26 20:29:18 UTC (rev 17204)
+++ dmraid.install	2008-10-26 21:16:09 UTC (rev 17205)
@@ -1,6 +1,3 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
 post_upgrade() {
   if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then
     # important upgrade notice
@@ -8,15 +5,10 @@
     echo ">>> IMPORTANT DMRAID UPGRADE NOTICE"
     echo ">>> -------------------------------"
     echo ">>> Version 1.0.15rc introduce a new name scheme:"
-    echo ">>> You need to a an additional 'p' in front of your number."
+    echo ">>> You need to add an additional 'p' in front of your number."
     echo ">>> e.g. <yourname><number> --> <yourname>p<number>"
     echo ">>>      firsthd1           --> firsthdp1"
     echo ">>> Please change your bootloader and fstab accordingly."
     echo ">>>"
   fi
 }
-
-op=$1
-shift
-
-$op $*

Modified: dmraid_hook
===================================================================
--- dmraid_hook	2008-10-26 20:29:18 UTC (rev 17204)
+++ dmraid_hook	2008-10-26 21:16:09 UTC (rev 17205)
@@ -6,9 +6,11 @@
         read dev_t < /sys/class/misc/device-mapper/dev
         /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':')
 
-        [ "${quiet}" = "y" ] && DMRAIDQUIET=">/dev/null"
-
         msg ":: Activating dmraid arrays..."
-        /sbin/dmraid -ay $DMRAIDQUIET
+        if [ "${quiet}" = "y" ]; then
+            /sbin/dmraid -ay >/dev/null
+        else
+            /sbin/dmraid -ay
+        fi
     fi
 }