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

[Dave Reisner]

    Date: Sunday, October 21, 2012 @ 15:56:31
  Author: dreisner
Revision: 169470

upgpkg: btrfs-progs 0.19.20121005-2

- remove add_file() call referring to nonexistant udev rule
- update hook help to denote hook is only needed for non-udev scenarios

Modified:
  btrfs-progs/trunk/PKGBUILD
  btrfs-progs/trunk/initcpio-hook-btrfs
  btrfs-progs/trunk/initcpio-install-btrfs

------------------------+
 PKGBUILD               |    8 ++++----
 initcpio-hook-btrfs    |    5 +----
 initcpio-install-btrfs |    5 ++---
 3 files changed, 7 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-21 18:59:02 UTC (rev 169469)
+++ PKGBUILD	2012-10-21 19:56:31 UTC (rev 169470)
@@ -4,7 +4,7 @@
 
 pkgname=btrfs-progs
 pkgver=0.19.20121005
-pkgrel=1
+pkgrel=2
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64)
 depends=('glibc' 'e2fsprogs')
@@ -17,6 +17,9 @@
 	initcpio-install-btrfs
 	initcpio-hook-btrfs)
 install=btrfs-progs.install
+md5sums=('7fb014324954ee073b039dc0066de960'
+         'd7ad825b0b25f2be73289a20e7afcdb7'
+         'b09688a915a0ec8f40e2f5aacbabc9ad')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -38,6 +41,3 @@
    mkdir -p ${pkgdir}/sbin
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
 }
-md5sums=('7fb014324954ee073b039dc0066de960'
-         'e5186ec3fe8a809b7473470128d1c4ab'
-         '9fb35142755b477a96cb7292f3d64839')

Modified: initcpio-hook-btrfs
===================================================================
--- initcpio-hook-btrfs	2012-10-21 18:59:02 UTC (rev 169469)
+++ initcpio-hook-btrfs	2012-10-21 19:56:31 UTC (rev 169470)
@@ -1,10 +1,7 @@
 #!/usr/bin/ash
 
 run_hook() {
-    # if udevd is running, this is done async by add/change events
-    if [ "$udevd_running" -ne 1 ]; then
-        btrfs device scan
-    fi
+    btrfs device scan
 }
 
 # vim: set ft=sh ts=4 sw=4 et:

Modified: initcpio-install-btrfs
===================================================================
--- initcpio-install-btrfs	2012-10-21 18:59:02 UTC (rev 169469)
+++ initcpio-install-btrfs	2012-10-21 19:56:31 UTC (rev 169470)
@@ -4,13 +4,12 @@
     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.
+This hook provides support for multi-device btrfs volumes. This hook
+is only needed for initramfs images which do not use udev.
 HELPEOF
 }