diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-30 14:59:24 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-30 14:59:24 +0200 |
| commit | 09dd4a97fccc4bcabe341c4e4490004385283e53 (patch) | |
| tree | d00a22a0304969ff70ecc680f3e89b5fab1ecce6 /core/btrfs-progs | |
| parent | 3a3f329b736af639fdd3c9621816bad627b96903 (diff) | |
| parent | 4982c269b318734d01ad30c6592fbb73565ceb12 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gource/PKGBUILD
community-staging/performous/PKGBUILD
community-staging/wt/PKGBUILD
extra/cups/PKGBUILD
extra/libwacom/PKGBUILD
extra/python-urwid/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-readline/PKGBUILD
staging/hugin/PKGBUILD
testing/cups/PKGBUILD
testing/cups/cups-no-gzip-man.patch
testing/cups/cups-systemd-socket.patch
testing/cups/cups.install
testing/systemd/PKGBUILD
Diffstat (limited to 'core/btrfs-progs')
| -rw-r--r-- | core/btrfs-progs/70-btrfs.rules | 1 | ||||
| -rw-r--r-- | core/btrfs-progs/PKGBUILD | 13 | ||||
| -rw-r--r-- | core/btrfs-progs/initcpio-hook-btrfs | 5 | ||||
| -rw-r--r-- | core/btrfs-progs/initcpio-install-btrfs | 4 |
4 files changed, 17 insertions, 6 deletions
diff --git a/core/btrfs-progs/70-btrfs.rules b/core/btrfs-progs/70-btrfs.rules new file mode 100644 index 000000000..c0e8c776c --- /dev/null +++ b/core/btrfs-progs/70-btrfs.rules @@ -0,0 +1 @@ +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k" diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 7524acca6..766fe7eed 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $ +# $Id: PKGBUILD 164224 2012-07-27 20:04:40Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs pkgver=0.19.20120328 -pkgrel=3 +pkgrel=4 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64 mips64el) depends=('glibc' 'e2fsprogs') @@ -13,11 +13,13 @@ conflicts=('btrfs-progs-unstable') 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 @@ package() { 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" diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs index 7965d0a8a..913cec528 100644 --- a/core/btrfs-progs/initcpio-hook-btrfs +++ b/core/btrfs-progs/initcpio-hook-btrfs @@ -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: diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs index a70a324ed..aad263378 100644 --- a/core/btrfs-progs/initcpio-install-btrfs +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -1,9 +1,11 @@ #!/bin/bash build() { - add_all_modules btrfs + add_module btrfs add_binary btrfs add_runscript + + add_file /usr/lib/udev/rules.d/70-btrfs.rules } help() { |