Include nfsv4 module and mount.nfs4 binary in the install hook.

2 files changed, 11 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ac58b05ee2f..52c2ff259cd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = mkinitcpio-nfs4-hooks
 	pkgdesc = Hooks for NFS v4 root support in mkinitcpio
 	pkgver = 0.3
-	pkgrel = 5
+	pkgrel = 7
 	url = http://www.archlinux.org/
-	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = mkinitcpio-nfs-utils=0.3-5
+	depends = nfs-utils
+	depends = mkinitcpio-nfs-utils=0.3-7
 
 pkgname = mkinitcpio-nfs4-hooks
 
diff --git a/PKGBUILD b/PKGBUILD
index e0b8ce09c59f..b837b40dd26f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,22 @@
-# Maintainer: Edvinas Valatka <edacval@gmail.com>
+# Maintainer: Reese Wang <thuwrx10 at gmail dot com>
+# Contributor: Edvinas Valatka <edacval@gmail.com>
 
 pkgname=mkinitcpio-nfs4-hooks
 pkgver=0.3
-pkgrel=5
+pkgrel=7
 pkgdesc="Hooks for NFS v4 root support in mkinitcpio"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.archlinux.org/"
 license=('GPL2')
-depends=("mkinitcpio-nfs-utils=$pkgver-$pkgrel")
+depends=("nfs-utils" "mkinitcpio-nfs-utils=$pkgver-$pkgrel")
 
 package() {
   install -Dm644 "/usr/lib/initcpio/install/net" "$pkgdir/usr/lib/initcpio/install/net_nfs4"
   install -Dm644 "/usr/lib/initcpio/hooks/net"   "$pkgdir/usr/lib/initcpio/hooks/net_nfs4"
   sed -i s/nfsmount/mount.nfs4/  "$pkgdir/usr/lib/initcpio/hooks/net_nfs4"
+  sed -i s/nfsv3/nfsv4/ "$pkgdir/usr/lib/initcpio/install/net_nfs4"
+  sed -i s/usr\\/lib\\/initcpio\\/nfsmount/usr\\/bin\\/mount.nfs4/ "$pkgdir/usr/lib/initcpio/install/net_nfs4"
+  sed -i s/bin\\/nfsmount/bin\\/mount.nfs4/ "$pkgdir/usr/lib/initcpio/install/net_nfs4"
 }