[arch-commits] Commit in btrfs-progs/trunk (4 files)
Dave Reisner
dreisner at archlinux.org
Tue Jul 24 01:21:48 UTC 2012
Date: Monday, July 23, 2012 @ 21:21:48
Author: dreisner
Revision: 164014
upgpkg: btrfs-progs 0.19.20120328-4
- add btrfs udev rule to scan partitions as they appear (FS#30751)
Added:
btrfs-progs/trunk/70-btrfs.rules
Modified:
btrfs-progs/trunk/PKGBUILD
btrfs-progs/trunk/initcpio-hook-btrfs
btrfs-progs/trunk/initcpio-install-btrfs
------------------------+
70-btrfs.rules | 1 +
PKGBUILD | 11 ++++++++---
initcpio-hook-btrfs | 5 ++++-
initcpio-install-btrfs | 2 ++
4 files changed, 15 insertions(+), 4 deletions(-)
Added: 70-btrfs.rules
===================================================================
--- 70-btrfs.rules (rev 0)
+++ 70-btrfs.rules 2012-07-24 01:21:48 UTC (rev 164014)
@@ -0,0 +1 @@
+ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k"
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-23 22:32:35 UTC (rev 164013)
+++ PKGBUILD 2012-07-24 01:21:48 UTC (rev 164014)
@@ -3,7 +3,7 @@
# Contributor: Tobias Powalowski <tpowa at archlinux.org>
pkgname=btrfs-progs
pkgver=0.19.20120328
-pkgrel=3
+pkgrel=4
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64)
depends=('glibc' 'e2fsprogs')
@@ -13,11 +13,13 @@
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)
md5sums=('f4504e73cf9254779b78d5b2318ac570'
- '3eae9bf1541e297fa72aa40ebf7320c6'
- 'b09688a915a0ec8f40e2f5aacbabc9ad')
+ '345c62c8b267082361729ca5b647518f'
+ 'e5186ec3fe8a809b7473470128d1c4ab'
+ '9fb35142755b477a96cb7292f3d64839')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -33,6 +35,9 @@
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"
Modified: initcpio-hook-btrfs
===================================================================
--- initcpio-hook-btrfs 2012-07-23 22:32:35 UTC (rev 164013)
+++ initcpio-hook-btrfs 2012-07-24 01:21:48 UTC (rev 164014)
@@ -1,7 +1,10 @@
#!/usr/bin/ash
run_hook() {
- btrfs device scan
+ # if udevd is running, this is done async by add/change events
+ if [ "$udevd_running" -ne 1 ]; then
+ btrfs device scan
+ fi
}
# vim: set ft=sh ts=4 sw=4 et:
Modified: initcpio-install-btrfs
===================================================================
--- initcpio-install-btrfs 2012-07-23 22:32:35 UTC (rev 164013)
+++ initcpio-install-btrfs 2012-07-24 01:21:48 UTC (rev 164014)
@@ -4,6 +4,8 @@
add_module btrfs
add_binary btrfs
add_runscript
+
+ add_file /usr/lib/udev/rules.d/70-btrfs.rules
}
help() {
More information about the arch-commits
mailing list