[arch-commits] Commit in btrfs-progs/trunk (4 files)

[Tom Gundersen]

    Date: Friday, October 5, 2012 @ 09:06:04
  Author: tomegun
Revision: 168025

upgpkg: btrfs-progs 0.19.20120904-7

reinstate udev rule

Added:
  btrfs-progs/trunk/70-btrfs.rules
Modified:
  btrfs-progs/trunk/PKGBUILD
  btrfs-progs/trunk/btrfs.install
  btrfs-progs/trunk/initcpio-install-btrfs

------------------------+
 70-btrfs.rules         |    1 +
 PKGBUILD               |   12 ++++++++----
 btrfs.install          |    6 +++---
 initcpio-install-btrfs |    4 +++-
 4 files changed, 15 insertions(+), 8 deletions(-)

Added: 70-btrfs.rules
===================================================================
--- 70-btrfs.rules	                        (rev 0)
+++ 70-btrfs.rules	2012-10-05 13:06:04 UTC (rev 168025)
@@ -0,0 +1 @@
+ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-05 12:03:57 UTC (rev 168024)
+++ PKGBUILD	2012-10-05 13:06:04 UTC (rev 168025)
@@ -4,7 +4,7 @@
 
 pkgname=btrfs-progs
 pkgver=0.19.20120904
-pkgrel=6
+pkgrel=7
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs')
@@ -15,7 +15,8 @@
 license=('GPL2')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
 	initcpio-install-btrfs
-	initcpio-hook-btrfs)
+	initcpio-hook-btrfs
+	70-btrfs.rules)
 install=btrfs.install
 
 build() {
@@ -27,6 +28,8 @@
      "$pkgdir/usr/lib/initcpio/install/btrfs"
    install -Dm644 "$srcdir/initcpio-hook-btrfs" \
      "$pkgdir/usr/lib/initcpio/hooks/btrfs"
+   install -Dm644 "$srcdir/70-btrfs.rules" \
+     "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
 }
 
 package() {
@@ -39,5 +42,6 @@
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
 }
 md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
-         '2d3df276f80bb09813f56a56d6f93ddd'
-         '9fb35142755b477a96cb7292f3d64839')
+         'e5186ec3fe8a809b7473470128d1c4ab'
+         '9fb35142755b477a96cb7292f3d64839'
+         '345c62c8b267082361729ca5b647518f')

Modified: btrfs.install
===================================================================
--- btrfs.install	2012-10-05 12:03:57 UTC (rev 168024)
+++ btrfs.install	2012-10-05 13:06:04 UTC (rev 168025)
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 post_upgrade() {
-  if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
-    echo "btrfs multi-device support now relies on linux 3.6 or later"
-  fi
+#  if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
+#    echo "btrfs multi-device support now relies on linux 3.6 or later"
+#  fi
 }
 
 # vim:set ts=2 sw=2 et:

Modified: initcpio-install-btrfs
===================================================================
--- initcpio-install-btrfs	2012-10-05 12:03:57 UTC (rev 168024)
+++ initcpio-install-btrfs	2012-10-05 13:06:04 UTC (rev 168025)
@@ -4,11 +4,13 @@
     add_module btrfs
     add_binary btrfs
     add_runscript
+
+    add_file /usr/lib/udev/rules.d/70-btrfs.rules
 }
 
 help() {
     cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes, in the absence of udev.
+This hook provides support for multi-device btrfs volumes.
 HELPEOF
 }