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

[Tom Gundersen]

    Date: Tuesday, October 2, 2012 @ 19:22:35
  Author: tomegun
Revision: 167681

initcpio: remove btrfs initcpio hooks, the functionality is now provided by udev

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

------------------------+
 PKGBUILD               |   14 ++------------
 initcpio-hook-btrfs    |   10 ----------
 initcpio-install-btrfs |   17 -----------------
 3 files changed, 2 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-10-02 22:57:36 UTC (rev 167680)
+++ PKGBUILD	2012-10-02 23:22:35 UTC (rev 167681)
@@ -13,9 +13,7 @@
 conflicts=('btrfs-progs-unstable')
 provides=('btrfs-progs-unstable')
 license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-        initcpio-install-btrfs
-        initcpio-hook-btrfs)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -30,13 +28,5 @@
    mv $pkgdir/usr/man $pkgdir/usr/share/man
    mkdir -p ${pkgdir}/sbin
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-
-   # install mkinitcpio hooks
-   install -Dm644 "$srcdir/initcpio-install-btrfs" \
-     "$pkgdir/usr/lib/initcpio/install/btrfs"
-   install -Dm644 "$srcdir/initcpio-hook-btrfs" \
-     "$pkgdir/usr/lib/initcpio/hooks/btrfs"
 }
-md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2'
-         'e5186ec3fe8a809b7473470128d1c4ab'
-         '9fb35142755b477a96cb7292f3d64839')
+md5sums=('d9c96e670fac7c2098a9e7ef98d4b2e2')

Deleted: initcpio-hook-btrfs
===================================================================
--- initcpio-hook-btrfs	2012-10-02 22:57:36 UTC (rev 167680)
+++ initcpio-hook-btrfs	2012-10-02 23:22:35 UTC (rev 167681)
@@ -1,10 +0,0 @@
-#!/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
-}
-
-# vim: set ft=sh ts=4 sw=4 et:

Deleted: initcpio-install-btrfs
===================================================================
--- initcpio-install-btrfs	2012-10-02 22:57:36 UTC (rev 167680)
+++ initcpio-install-btrfs	2012-10-02 23:22:35 UTC (rev 167681)
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    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.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et: