[arch-commits] Commit in btrfs-progs/trunk (70-btrfs.rules PKGBUILD)

[Tom Gundersen]

    Date: Friday, September 21, 2012 @ 10:22:24
  Author: tomegun
Revision: 166905

ditch udev rule

This is included in systemd/udev itself now so is not necessary to include.

We likely still will have the racecondition due to module loading, but that should be
fixed in kmod/kernel soon.

Modified:
  btrfs-progs/trunk/PKGBUILD
Deleted:
  btrfs-progs/trunk/70-btrfs.rules

----------------+
 70-btrfs.rules |    1 -
 PKGBUILD       |    5 -----
 2 files changed, 6 deletions(-)

Deleted: 70-btrfs.rules
===================================================================
--- 70-btrfs.rules	2012-09-21 14:17:12 UTC (rev 166904)
+++ 70-btrfs.rules	2012-09-21 14:22:24 UTC (rev 166905)
@@ -1 +0,0 @@
-ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-21 14:17:12 UTC (rev 166904)
+++ PKGBUILD	2012-09-21 14:22:24 UTC (rev 166905)
@@ -14,7 +14,6 @@
 provides=('btrfs-progs-unstable')
 license=('GPL2')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-        70-btrfs.rules
         initcpio-install-btrfs
         initcpio-hook-btrfs)
 
@@ -32,9 +31,6 @@
    mkdir -p ${pkgdir}/sbin
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
 
-   # add udev rule
-   install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
-
    # install mkinitcpio hooks
    install -Dm644 "$srcdir/initcpio-install-btrfs" \
      "$pkgdir/usr/lib/initcpio/install/btrfs"
@@ -42,6 +38,5 @@
      "$pkgdir/usr/lib/initcpio/hooks/btrfs"
 }
 md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
-         '345c62c8b267082361729ca5b647518f'
          'e5186ec3fe8a809b7473470128d1c4ab'
          '9fb35142755b477a96cb7292f3d64839')