[arch-commits] Commit in dmraid/repos (5 files)

[Tobias Powalowski]

    Date: Wednesday, May 20, 2009 @ 03:29:05
  Author: tpowa
Revision: 39694

Merged revisions 39688,39692 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/dmraid/trunk

........
  r39688 | tpowa | 2009-05-20 07:14:21 +0000 (Mi, 20 Mai 2009) | 1 line
  
  upgpkg: dmraid 1.0.0.rc14-4
........
  r39692 | tpowa | 2009-05-20 07:27:29 +0000 (Mi, 20 Mai 2009) | 1 line
  
  upgpkg: dmraid 1.0.0.rc14-4
........

Modified:
  dmraid/repos/testing-i686/	(properties)
  dmraid/repos/testing-i686/PKGBUILD
  dmraid/repos/testing-i686/dmraid.install
  dmraid/repos/testing-i686/dmraid_hook
  dmraid/repos/testing-i686/dmraid_install

----------------+
 PKGBUILD       |    6 +++---
 dmraid.install |   24 ++++++++++++------------
 dmraid_hook    |    1 +
 dmraid_install |    2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)


Property changes on: dmraid/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /dmraid/trunk:1-38984
   + /dmraid/trunk:1-39693

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-05-20 07:28:06 UTC (rev 39693)
+++ testing-i686/PKGBUILD	2009-05-20 07:29:05 UTC (rev 39694)
@@ -4,7 +4,7 @@
 
 pkgname=dmraid
 pkgver=1.0.0.rc14
-pkgrel=3
+pkgrel=4
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 depends=(device-mapper)
@@ -16,8 +16,8 @@
 options=(force)
 install=dmraid.install
 md5sums=('a0e7d0bb5394e15c878ac86afd72c08e'
-         '8f8b6fb332fce85a27d72fc63385db70'
-         '60e095be004ce66771d56235c5f7be13')
+         'db9a72cbf07560059d407c874f646240'
+         '2b2719d5bf463f411701241bba3d8120')
 
 build() {
   cd $srcdir/$pkgname/$pkgver

Modified: testing-i686/dmraid.install
===================================================================
--- testing-i686/dmraid.install	2009-05-20 07:28:06 UTC (rev 39693)
+++ testing-i686/dmraid.install	2009-05-20 07:29:05 UTC (rev 39694)
@@ -1,16 +1,16 @@
 post_upgrade() {
-  if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then
-    # important upgrade notice
-    echo ">>>"
-    echo ">>> IMPORTANT DMRAID UPGRADE NOTICE"
-    echo ">>> -------------------------------"
-    echo ">>> Version 1.0.15rc introduce a new name scheme:"
-    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
+  #if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then
+  #  # important upgrade notice
+  #  echo ">>>"
+  #  echo ">>> IMPORTANT DMRAID UPGRADE NOTICE"
+  #  echo ">>> -------------------------------"
+  #  echo ">>> Version 1.0.15rc introduce a new name scheme:"
+  #  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
   if [ "$(vercmp $2 1.0.0.rc14)" -gt 0 ]; then
     # important downgrade notice
     echo ">>>"

Modified: testing-i686/dmraid_hook
===================================================================
--- testing-i686/dmraid_hook	2009-05-20 07:28:06 UTC (rev 39693)
+++ testing-i686/dmraid_hook	2009-05-20 07:29:05 UTC (rev 39694)
@@ -2,6 +2,7 @@
 run_hook ()
 {
     /sbin/modprobe -q dm-mod >/dev/null 2>&1
+    /sbin/modprobe -q dm-mirror >/dev/null 2>&1
     if [ -e "/sys/class/misc/device-mapper" ]; then
         read dev_t < /sys/class/misc/device-mapper/dev
         /bin/mknod "/dev/mapper/control" c $(/bin/replace "${dev_t}" ':')

Modified: testing-i686/dmraid_install
===================================================================
--- testing-i686/dmraid_install	2009-05-20 07:28:06 UTC (rev 39693)
+++ testing-i686/dmraid_install	2009-05-20 07:29:05 UTC (rev 39694)
@@ -2,7 +2,7 @@
 
 install ()
 {
-    MODULES=" dm-mod "
+    MODULES=" dm-mod dm-mirror "
     BINARIES=""
     FILES=""
     SCRIPT="dmraid"