[sys-fs/zfs] Update to recent version

(Portage version: 2.2.0_alpha32/git/Linux x86_64, signed Manifest commit with key F82F92E6)

4 files changed, 51 insertions, 89 deletions

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index f9a30b6d7..aaa71209d 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 AUX zfs-0.6.0-includedir.patch 586 RMD160 eb4cc6a9d66721e70c932b1dd640abd852d5470d SHA1 c673e057008b4cb7d4c45b936533e9bceff2443c SHA256 047a0cec35bcc5f8050fa80f8203ea020bf148375297c64300a9607f062cec2d
-AUX zfs.initd 2628 RMD160 6eea803152c6e4eb9caa33174c74c853b85b633f SHA1 f1c89646e621102c51d666d07c6bb2c7e573ce88 SHA256 179c834b449a2e27e31c24837fdaf0f539e760b214802fbb27d0e8e1a4e66d24
-DIST zfs-0.6.0-rc3.tar.gz 1918941 RMD160 08c5f0b68a74c660fb6eaf6be846bbca5d5c62f6 SHA1 ce251400cf98469becbeaa7513c788ce45a0f50e SHA256 ad643be4227c4d19314f0116195a0274019d3727f97446dd44a241a3c2b21001
-EBUILD zfs-0.6.0_rc3.ebuild 1604 RMD160 b738938a641822d3cde856227d193e4bf9a178a3 SHA1 18a8b8688e917160b573c830980b7ba8d51f2314 SHA256 db2e724bc7248418859b038d40430d2cf8b363a913225498f94b1ac87955666c
-EBUILD zfs-9999.ebuild 1566 RMD160 68d6d5abf6b25140be0e7601ddf68f53e9cb7085 SHA1 a6a1a114602c79cd156fbadcc3ba7512538688b5 SHA256 537fd2b438fc39a3cc58da89f699f0c820c82720c9d593ae45959b7a725c767d
+AUX zfs.initd 2052 RMD160 3636ead94d4b7200cc221b9e9646b85a5c3acc1a SHA1 d59d5b475c3dc335bf70a24a7af80ef7a38df347 SHA256 ad5e5aa282f2942b23364b5dcb43b4edea5c3923559d18d624ca9bcb51218476
+DIST zfs-0.6.0-rc4.tar.gz 1870362 RMD160 190677dddcf54835ab933f2ec891f189dc1cb39e SHA1 c01bb9458586c5b50ee4d3dfb8b6059689da1e12 SHA256 947f3bd84998c6e9047cf68a37d3f029b850c9470d3a65f99edb246f73fa7c7d
+EBUILD zfs-0.6.0_rc4.ebuild 1604 RMD160 b738938a641822d3cde856227d193e4bf9a178a3 SHA1 18a8b8688e917160b573c830980b7ba8d51f2314 SHA256 db2e724bc7248418859b038d40430d2cf8b363a913225498f94b1ac87955666c
+EBUILD zfs-9999.ebuild 1507 RMD160 348d2ff51ad8a3aed6cdd319784e503d4abc2ebb SHA1 be5a7374fa4b22c8f6a8b137960b2242bda99298 SHA256 c42c5cc57c32e698682eaf5cb9502011d770f34611d2933aab75fc7983da3998
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNvtLuAAoJEOf+E+/4L5Lma8AP/Rz6YlwPNsr+5RnxtJIjKU+P
-tkP0mCJBctqnp7HJ+MwmZjk2TW4vsXg7wl7k8c0LrHLlXb3ulCDVzUfF1URrLYIA
-UDH9wJ1RrWwjPMTWnMAXcPbc2oxtirMD3A5TfN1sh2CVqVw3oPu92fhXCIiIjCXx
-XhpLTxCHWNO4K3cWCTPmmMa5SvAnAgE0EHForRrIBqNWA/kPO/UyFclPMnG/Y9x5
-+BZ5iYJXyc/+y13QlpLA9UuNhxwPpTI4k9WSJ5sXzF2EycLvxqKsYh3s/NaI+3ug
-snww6Bk34nn2NmxtQRnE665PV/Uzb8MxQLqkdq5jC7Dk+ne2NKTfZeNagDtCkoFB
-yKHoUlo23jgDspuLFw/ioMl+6EPk3cmQFjSt9XMvLeGW28ALKUlhQSD0EPcOStls
-aExYu1+XStPSNtp4QwK+WchcqrL073TW1goaa/Vp+0LtTCPRpq6frRWIKWB/wqo0
-3tyc+qhEo0yB5Q7NfXl/FDheypk5SIwuPMbmNCt9izRuA9XII+gwmrYVg52llixt
-DSpYWkis+x8O3uWhimH7pUt8x/ehGPWJd4i1XvO8l0fDvWssj9p7dJPUzirL8Eg2
-Q0uWZbBSv106Bqj5NVkOTdSO+BGqIV0uh+YG3bF4cdt4+yvrLWhhk3ZfWQcPwE6E
-OVELNCdbDLO+naIAcEFb
-=tA6m
+iQIcBAEBCAAGBQJNzojcAAoJEOf+E+/4L5LmKj8P/1Ahh+mX9Nz7qskvZlJfPa0/
+qXkEAHxHaNPEVfs71Q+Qk6r3yJD8DJbgxKAK9LoNaG0CxIYidTNd1xMYCCkcI1s7
+DaCWwB4Ivcy/bESXjUb/7hR4LjkCK/LjPRiu3EDoZQvSehG7kwoUuklAwL994uew
+Eu/mWVqplnMcz+v0SAGW3zAtFQZNEwqJ3sx8bWP0O8Iq9lztuODxO15yGo6Ifqe5
+lhpis5qFUgJUOXY09a8TxTd1AGEJ6ZJ77WlK2IWq+m6aTlzmJYX2rl1Y5vlZPj5w
+fd2fJ64wrSrsZ1q9MLUIlOrdDWXd3sd2CxHANC5mcyDUoDgO+BZuCLJ/55Nd/4CJ
+sgFvBYNd2gULmBAli4eoyHe8cgAAKT17KWaOwNnQB0ZeT2LgySuSwdH6OSpmfFs1
+OZmlUym2ya3E/b1jpsfb3JAhfqRM548OyV0BWnZy96s98bRZMccqWM96cMBkDx+L
+u440kC9LTwIMrqe2qcbErnmKnKFRbQQrXvrmVAQeR3vmlE8HLVmVKKZdrRhva6xx
+GXmf2xEewG/ln1HFI8PxaMYV7kKtS/2+IUBPFz/1308y9iESx7bZBdAkDPtG4Zy8
+3KVnft2BMNIvFQD+dvrL5gDCEgA9PBlJfGOKdAZF+wvzK0nzM7lEvBQvvRgEA24i
+S91UiyNaqOAhVDTPwAQd
+=pBY9
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/zfs/files/zfs.initd b/sys-fs/zfs/files/zfs.initd
index 878c05472..c9c563429 100644
--- a/sys-fs/zfs/files/zfs.initd
+++ b/sys-fs/zfs/files/zfs.initd
@@ -3,54 +3,48 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs,v 0.9 2011/04/30 10:13:43 devsk Exp $
 
-depend() {
+depend()
+{
 	before net
 	after udev
+	keyword -lxc -openvz -prefix -vserver
 }
 
 CACHEFILE=/etc/zfs/zpool.cache
 ZPOOL=/usr/sbin/zpool
 ZFS=/usr/sbin/zfs
 ZFS_MODULE=zfs
-LOCKFILE=/var/lock/zfs/zfs_lockfile
 
-checksystem()
-{
-	/sbin/modinfo $ZFS_MODULE &>/dev/null
-	if [[ $? -ne 0 ]]
-	then
-		eerror "$ZFS_MODULE not found. Is the ZFS package installed?"
-		return 1
-	fi
-	if [[ ! -x $ZPOOL ]]
-	then
-		eerror "$ZPOOL binary not found."
-		return 1
-	fi
-	if [[ ! -x $ZFS ]]
-	then
-		eerror "$ZFS binary not found."
-		return 1
+checksystem() {
+	if [ -c /dev/zfs ]; then
+		einfo "ZFS modules already loaded"
+		return 0
+	else
+		einfo "Checking if ZFS modules present"
+		if [ "x$(modprobe -l  $ZFS_MODULE | grep $ZFS_MODULE)" == "x" ]; then
+			eerror "$ZFS_MODULE not found. Is the ZFS package installed?"
+			return 1
+		fi
 	fi
+	einfo "Checking if zfs userspace tools present"
+		if [ ! -x $ZPOOL ]; then
+			eerror "$ZPOOL binary not found."
+			return 1
+		fi
+		if [ ! -x $ZFS ]; then
+			eerror "$ZFS binary not found."
+			return 1
+		fi
 	return 0
 }
 
-start()
-{
-	if [[ -f $LOCKFILE ]]
-	then
-		einfo "ZFS already running, please stop it first. Delete $LOCKFILE if its not so."
-		eend 3
-		return 3
-	fi
+start() {
 	ebegin "Starting ZFS"
 	checksystem || return 1
-	if ! grep -q $ZFS_MODULE /proc/modules
-	then
-		/sbin/modprobe $ZFS_MODULE &>/dev/null
+	if [ ! -c /dev/zfs ]; then
+		modprobe $ZFS_MODULE
 		rv=$?
-		if [[ $rv -ne 0 ]]
-		then
+		if [ $rv -ne 0 ]; then
 			eerror "Failed to load the $ZFS_MODULE module, check 'dmesg|tail'."
 			eend $rv
 			return $rv
@@ -59,16 +53,13 @@ start()
 
 	# Import all pools described by the cache file, and then mount
 	# all filesystem based on their properties.
-	if [[ -f $CACHEFILE ]]
-	then
+	if [ -f $CACHEFILE ]; then
 		einfo "Importing ZFS pools"
-
 		# as per fedora script, import can fail if all pools are already imported
 		# The check for $rv makes no sense...but someday, it will work right.
 		$ZPOOL import -c $CACHEFILE -aN 2>/dev/null || true
 		rv=$?
-		if [[ $rv -ne 0 ]]
-		then
+		if [ $rv -ne 0 ]; then
 			eerror "Failed to import not-yet imported pools."
 			eend $rv
 			return $rv
@@ -78,57 +69,30 @@ start()
 	einfo "Mounting ZFS filesystems"
 	$ZFS mount -a
 	rv=$?
-	if [[ $rv -ne 0 ]]
-	then
+	if [ $rv -ne 0 ]; then
 		eerror "Failed to mount ZFS filesystems."
 		eend $rv
 		return $rv
 	fi
-
-	# hack to read mounted file systems because otherwise
-	# zfs returns EPERM when a non-root user reads a mounted filesystem before root did
-	savepwd="$PWD"
-	mount | grep " type zfs " | sed 's/.*on //' | sed 's/ type zfs.*$//' | \
-	while read line
-	do
-		cd "$line" &> /dev/null
-		ls &> /dev/null
-	done
-	cd "$savepwd"
-
-	touch $LOCKFILE
+	
 	eend 0
 	return 0
 }
 
 stop()
 {
-	if [[ ! -f $LOCKFILE ]]
-	then
-		einfo "ZFS is not started, remove $LOCKFILE if its not so."
-		eend 3
-		return 3
-	fi
 	ebegin "Unmounting ZFS filesystems"
-	sync
 	$ZFS umount -a
-	if [[ $rv -ne 0 ]]
-	then
+	rv=$?
+	if [ $rv -ne 0 ]; then
 		eerror "Failed to umount ZFS filesystems."
 	fi
-	rm -f $LOCKFILE
+	
 	eend $rv
 }
 
 status()
 {
-	if [[ ! -f $LOCKFILE ]]
-	then
-		einfo "ZFS is not started, remove $LOCKFILE if its not so."
-		eend 3
-		return 3
-	fi
-
 	# show pool status and list
 	$ZPOOL status && echo && $ZPOOL list
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild b/sys-fs/zfs/zfs-0.6.0_rc4.ebuild
index a7316c728..a7316c728 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc3.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc4.ebuild
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 5625db6ce..efb5f7cd0 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -9,7 +9,7 @@ AT_M4DIR=./config  # for aclocal called by eautoreconf
 
 EGIT_REPO_URI="http://github.com/behlendorf/zfs.git"
 
-inherit autotools eutils git linux-mod
+inherit autotools eutils git-2 linux-mod
 
 DESCRIPTION="Native ZFS for Linux"
 HOMEPAGE="http://wiki.github.com/behlendorf/zfs/"
@@ -61,8 +61,6 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die 'emake install failed'
-	newinitd "${FILESDIR}/zfs.initd" zfs
-	keepdir /var/lock/zfs
 	# Drop unwanted files
 	rm -rf "${D}/usr/src" || die "removing unwanted files die"
 }