The zfs-shutdown script will never work as originally envisioned, so I am removing it from the tree.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

8 files changed, 48 insertions, 135 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 7f4ebbbda2c5..69a0a0982f65 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-fs/zfs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.53 2012/12/23 05:44:24 ryao Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.54 2013/01/05 16:21:37 ryao Exp $
+
+*zfs-0.6.0_rc13-r1 (05 Jan 2013)
+*zfs-0.6.0_rc11-r2 (05 Jan 2013)
+*zfs-0.6.0_rc10-r3 (05 Jan 2013)
+*zfs-0.6.0_rc12-r2 (05 Jan 2013)
+
+  05 Jan 2013; Richard Yao <ryao@gentoo.org> +zfs-0.6.0_rc10-r3.ebuild,
+  +zfs-0.6.0_rc11-r2.ebuild, +zfs-0.6.0_rc12-r2.ebuild,
+  +zfs-0.6.0_rc13-r1.ebuild, -files/linuxrc, -files/zfs-shutdown,
+  -zfs-0.6.0_rc10-r2.ebuild, -zfs-0.6.0_rc11-r1.ebuild,
+  -zfs-0.6.0_rc12-r1.ebuild, -zfs-0.6.0_rc13.ebuild:
+  The zfs-shutdown script will never work as originally envisioned, so I am
+  removing it from the tree.
 
 *zfs-0.6.0_rc13 (23 Dec 2012)
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 5c142127a9d6..8bcfbc0bf9fe 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,14 +1,12 @@
 AUX bash-completion 6203 SHA256 15e742477fad0104871fc055b6ce9bf803540070e47fa515ea7ca3c1a401f831 SHA512 e7ccb7179c4c455c496daab192099d7553674b9505801e25a2ea8c67a1b4de15d68ac99b2c3347c1f3454f88ede7694f08da61c5d061f0577bb1594ca4a90f12 WHIRLPOOL 79dfdc9c80a707f6bb39bea51ec451c16b821886ce3e84c73a249313d991cf8019f0647b0fe439754fc1ad08cb294bf4c245955fdc4af30286a8afd61dba21ba
-AUX linuxrc 225 SHA256 69c5f407ae20a5e3000dc6389f8c75ee97e11c353489a00cb619134b103bf538 SHA512 b8f311a9ac9008d4f3b30bb2b7ac0144aec6029245ddb50a32fe0b485c9df96db23569d30de502d31d944588513107e6144b535249b704b90b586a2593dd5200 WHIRLPOOL 9de672c9b2a44fa5daab5c48d988465797a1b6fdb5431366969a0172e733b4933bac6ca256977331862e9410c474431b26cf50658fbac1d9b3282e65bf3f83e2
-AUX zfs-shutdown 1452 SHA256 bc65bf8f0432fd0267020ae5a049046d6f0e0fc953e1757a942b52f8024dfcc1 SHA512 9c87dddc65826f1072764deb57d162ee5a813f0f38feb0e1ce424dedd8e776e97387cea0805ad3671778493b7787841175167c2154f8796cb642abd436063550 WHIRLPOOL 54c7e98b2d96222250800c15b6aaf581b034661e4d1d32166f8352dce8cae2d958344949e9b6740f061dc5c158e55858a21dc97f8f35f59a2b9fcc0390120c71
 DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761
 DIST zfs-0.6.0-rc11.tar.gz 2099538 SHA256 4701f9d32d3475650068d0c07b968f0de443103d73db315b4f328c296cd6a073 SHA512 4bd2fc3cd5eb89f64b7b92a16e416edb245b0a9b90b5e1aa3bd1560c7d568322de03fdb40ede2d8417b0b642bbf70a1e804d51e4537babbfa9c767271b701138 WHIRLPOOL c56034028fd7c21f516ceb268cc25eeedd129a2a7cb8c1615f43982a86bb4400e80ab74159c4fc5d24a79610e2c0935f54cbc33c447751f29cecec882bfef89e
 DIST zfs-0.6.0-rc12.tar.gz 2150456 SHA256 3eb85e4028480e9dd56e29eca0a4e71565c1501f0159c80a1b1ff961b6f137d6 SHA512 55f0d9ea9f085d78a4929250949449ec4329a71c00ecd6fe76322716b64dc1152d93a23bb8b18e4ba7e1fbd6110b170366763f730c1e5006998aee3870e3635e WHIRLPOOL ea8fbe2edb2e0029affed261916d10ef350129c496b71064d34749b805d83c1531d886a55802839bb4226e298719f708f6816ee5411626b431b1d506bbf10232
 DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798
-EBUILD zfs-0.6.0_rc10-r2.ebuild 2536 SHA256 e8209abe6ee924893caf05d91ecc763e549d641d6fadfed5655605ed42650289 SHA512 9c4ef1493820a09756539418adf78a83f7357719b2ac2f781850991455ee8d61d2571dbd5aa2bc9447202d758a99de5a6cef35bdc383ecd81d4f0670a34d865b WHIRLPOOL 6e0ad0283c1b5cca4f26edf34edb853460967a2c0f4a569e2a3772808f7310ec0183f31f479a0578265a8223749129e89e8cab5338f849e7478665742be99b6a
-EBUILD zfs-0.6.0_rc11-r1.ebuild 2536 SHA256 ba705d0a8800d0fa55e0bc0d79b50aaf392bb573d3d46c5572a67efb07d41a69 SHA512 35db2625eb7b6052da43ad2ac66eb0b68883e2c215f2fa69dae0e811781de09ca12f9f35a712660d24150d1382f69229aa3a9f746f580fe9aefc937d31af7ef6 WHIRLPOOL 7f8916a6584ba7438282486af066e48e4222ee2867aecb8389b4fbd79e38adbe5c61edeb65b717d4207db86702c0f43296ff0d18e7521aaa90d1a81b8b9a502e
-EBUILD zfs-0.6.0_rc12-r1.ebuild 2536 SHA256 737ecfc9869a1ab1c9b653cc15feba5f81cb95bb8c433108f74cb43d95794fec SHA512 750e0f57a2664ee077e2f8b794adc60c4347b605cfdbe53ffa8210b19c4849d276d67467889fc026e6077577d74cd0b0e69e5c81ee9c5e433af8221c2e11e27d WHIRLPOOL 68cc05dd53f8b58b36879d045d4faebcf39f0339e394dc5bca3e89777ba136b9e9339524b3fcf486f840f8e1a84bf771c33f655f8ad30211d436accb14814434
-EBUILD zfs-0.6.0_rc13.ebuild 2532 SHA256 6ade62f02205c0bdfc8b8a8e605a57693f79f77abeea745f70f2ab2914333f73 SHA512 a24c68ac15d9e0aac806608e5e5993d7543d951586502341d7bb47c5d2d02781ee3726cd2dca0f951d3a59416aadaf488d75c6103161740c2eb670ed4d21c229 WHIRLPOOL f0afcfb5b89d7167cc77af50532115658ad22bc7288ef30ec651c0f2107b7b268e37a9d259074900a44c61ca1bf142a0efbb783249284d879f91e76b1793d065
+EBUILD zfs-0.6.0_rc10-r3.ebuild 2467 SHA256 d7f870e42e5176a46f881879ef6e125ce3ded2d388fcd35acdbfbf12ecb19c3a SHA512 5969552979dee690aab05e2d938b7f0966c7b296c06dcdccb4c694cacda3aa263bdb440e11e050dcd6bc1c915235ae64f3681d8ba14bc4e99c3880d7b43fbcac WHIRLPOOL de0286ce2e2b3667fb2677fa018119995d484f521dd8762a14a3d24749c13cc2886c0d889dc57a6ba72695e2b500d9f7fdc05215d66ce337612ad428ee3c6f9e
+EBUILD zfs-0.6.0_rc11-r2.ebuild 2467 SHA256 7056cd5086c08bb7fd7b2b1b573ae1e5535ba4f37564ff43dfdee8c2b533a8c2 SHA512 5474b8d3ff1d9a8116a4659e0739f46f16d71cfb90ccd04507471a00223c42940ea7f44084b8d318488862ae5f86e2d07cbfe74665b0bd720593593a4492097d WHIRLPOOL 3d42751fb60873ec2b78023c85e296dc6beaea5c231586d59f9315a600bf17815893df10a7f1fd6a1e0bd902cb2b83b0b2b4beddf8f0c3d3fc7e7fa7eceecfee
+EBUILD zfs-0.6.0_rc12-r2.ebuild 2467 SHA256 9c93b75f2cf728c527a21db81e6b4dd9a6c1e9fc7a74f33f8a599423aaffb6e6 SHA512 394b109689887030331b4a6a729be9a6f8265cfebb247a48e072ff211e8022d255127f251ca33522f7679c2aa0a84b635f1bf8ebda680c5e4158fb9746e503a1 WHIRLPOOL 138b65decb7a8f4f6fd420ab8477d37b473ea4a7be15256c93fb0003147fa35c2a722847eba867ca8a9efbd171574b690e6370f446b8dc570e4478736af90ab1
+EBUILD zfs-0.6.0_rc13-r1.ebuild 2471 SHA256 ecd49aaca535b2eb1b363f86526f2f2cd1bba8eb1905953383f21ba8fc38b6f6 SHA512 235a3298ebce3e1a389dbaacde14f532afdf39272131f2c20c9de82bc54c9b4268bcf1f56f311ff6c079dec2dc9b7b11ad692a6ba826f49c6508f3d8d3a6f4df WHIRLPOOL cdc6a465d1409c1fc00cecf3cb6530274726399465f82f8e559866af4347aa2a3c4ee6ae8e635e4849816dce038a7e3ce9264775604d69286795c3f20cc0a292
 EBUILD zfs-9999.ebuild 2528 SHA256 fe33d29e7e10a27fa9d326daf070e211da2f5b4a6446b8027ebd70ab91f22fdd SHA512 30f4d76f13e5d323a4f7ebe3f126ce962a7f827924e8319bdfeb81d982b67aa219de7ce4d6f2028ed26916bb1d8c05a6ed4e8b02a90cfe44b932b48e02437b74 WHIRLPOOL 193012ae7ec570c3b14b75f57cde145d54974ac53aefb16d7f3a2c72a8eb776cd082f78cffa93713e93b9d1587f8c1a842f9ba9379992f10390b15cae48a3da0
-MISC ChangeLog 9784 SHA256 7d58a472e14a2f703c2104aabf274b83d45ed85d3c469bd844d72b44a1d2da04 SHA512 6d8355756db22c7808791cde109e01919f04e8c0903386ff8720651a6c9987c18abde266b76e9e451d04790bbb5ce9b72322fbd162e5c9ab7d796a3c81de69f2 WHIRLPOOL 86f34227545eba5d18f28eb5db59aa2c1ff7d1686fa81158d910a0ab3c0e158eb2e7ae9f56b750b3839fce6c769cd7f3684499f8fcc6126df15576f3e2e0c010
+MISC ChangeLog 10326 SHA256 6ae03b8a8f704800c85bb2082ec863e3afc7c6e2fdf0c9476440330d93e42c4c SHA512 cb5d14b0c9aefa77cf2a2e275fef4c4185d36becb789e7541883798f8dbc551775e8f5f9870c4fa5fe07e305f9ea86faac92449a1d80a6c8ebdd7494db2dcc5c WHIRLPOOL 8a3201b016d541bc8cd828f1b43fe2d3c68e724c8a25c1757fc2ad997028da01d57e52b053a474b9890a768bd98731da6c7a4162136cc0272b4a3c5e71325541
 MISC metadata.xml 548 SHA256 03ce3fb0462330da4a71ca48948fcf1934e6a5ae1193fc4e3f36fc80f5e6cc22 SHA512 f05831b3d01bd187a6e97252a70dd4e14eb0736b68f79e80905e6345a21229b473f0784d91403152e10de57d7f66b48a0253295b444d5a949f0fdf72f4ee95e3 WHIRLPOOL 3825bb9a365ede4c67069d4b519af28081604009dee6dbe8f99b08028564816f0676baf5239e6adc698de245a596eae7d444a0e82cd2c6555d0bee20e4beb81a
diff --git a/sys-fs/zfs/files/linuxrc b/sys-fs/zfs/files/linuxrc
deleted file mode 100644
index 1e63837fad04..000000000000
--- a/sys-fs/zfs/files/linuxrc
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-PATH="/usr/sbin:/usr/bin:/sbin:/bin"
-
-j=0
-for i in $(cat /movefs)
-do
-	mkdir "/${j}"
-	mount --move "${i}" "/${j}"
-	j=$(expr $j + 1)
-done
-
-zfs umount -a
-
-for i in $(zpool list -H -o name)
-do
-	zpool export "$i"
-done;
diff --git a/sys-fs/zfs/files/zfs-shutdown b/sys-fs/zfs/files/zfs-shutdown
deleted file mode 100644
index d7bba30ae8d0..000000000000
--- a/sys-fs/zfs/files/zfs-shutdown
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Released under the 2-clause BSD license.
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/files/zfs-shutdown,v 1.2 2012/11/29 05:19:12 ryao Exp $
-
-description="Export ZFS Root Filesystem"
-
-copy_binaries() {
-	local destdir=$1
-	shift
-	lddtree "$@" \
-		| tr ')(' '\n' \
-		| awk  '/=>/{ if($3 ~ /^\//){print $3}}' \
-		| sort \
-		| uniq \
-		| cpio -p --make-directories --dereference --quiet $destdir
-
-}
-
-depend()
-{
-	need mount-ro
-	keyword -prefix -openvz -vserver -lxc
-}
-
-start()
-{
-
-	ROOTFSTYPE=$(df -TP / | awk 'NR>1{print $2}')
-	TMPDIR='/dev/pivot_root'
-	MOVEFS=$(df -TP -x zfs | awk 'NR>2{print $7}')
-
-	# Make sure that we are dealing with zfs
-	if test "${ROOTFSTYPE}" = "zfs"
-	then
-		eerror "rootfs is not zfs"
-		return 1
-	fi
-
-	# Construct new rootfs
-	mkdir -p "${TMPDIR}"
-	mount -t tmpfs none ${TMPDIR}
-	mkdir "${TMPDIR}/oldroot" "${TMPDIR}/dev"
-	mknod -m 660 "${TMPDIR}/dev/null" c 1 3
-	mknod -m 660 "${TMPDIR}/dev/zfs" c 10 59
-
-	# Make tmpfs root filesystem
-	copy_binaries ${TMPDIR} $(which chroot sh cat mount mkdir zfs zpool)
-
-	# Make directories for temporary mounts
-	for i in $(seq $(echo "$MOVEFS" | wc -w)); do mkdir "${TMPDIR}/${i}"; done;
-
-	# Pass temporary mount information to chroot
-	echo "$MOVEFS" > "${TMPDIR}/movefs"
-
-	# Copy shutdown script
-	cp /usr/share/zfs/linuxrc "${TMPDIR}/linuxrc"
-
-	# Pivot into new root
-	cd "${TMPDIR}"
-	pivot_root . oldroot
-	exec chroot . /linuxrc
-
-}
diff --git a/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild
index e6518c866817..2dbff4613bed 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild,v 1.2 2012/12/03 02:03:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r3.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
 
 EAPI="4"
 
@@ -86,13 +86,6 @@ src_install() {
 	rm -rf "${ED}usr/share/dracut"
 	use test-suite || rm -rf "${ED}usr/libexec"
 
-	if use rootfs
-	then
-		doinitd "${FILESDIR}/zfs-shutdown"
-		exeinto /usr/share/zfs
-		doexe "${FILESDIR}/linuxrc"
-	fi
-
 	newbashcomp "${FILESDIR}/bash-completion" zfs
 
 }
@@ -102,7 +95,10 @@ pkg_postinst() {
 	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
 		|| ewarn 'You should add zfs to the boot runlevel.'
 
-	use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
-		|| ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
 
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild b/sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild
index ab71dc45953b..fbff131b2432 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild,v 1.2 2012/12/03 02:03:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r2.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
 
 EAPI="4"
 
@@ -86,13 +86,6 @@ src_install() {
 	rm -rf "${ED}usr/share/dracut"
 	use test-suite || rm -rf "${ED}usr/libexec"
 
-	if use rootfs
-	then
-		doinitd "${FILESDIR}/zfs-shutdown"
-		exeinto /usr/share/zfs
-		doexe "${FILESDIR}/linuxrc"
-	fi
-
 	newbashcomp "${FILESDIR}/bash-completion" zfs
 
 }
@@ -102,7 +95,10 @@ pkg_postinst() {
 	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
 		|| ewarn 'You should add zfs to the boot runlevel.'
 
-	use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
-		|| ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
 
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild
index 1c7630cfcc68..81c4c4bb5a1c 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild,v 1.2 2012/12/03 02:03:03 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r2.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
 
 EAPI="4"
 
@@ -86,13 +86,6 @@ src_install() {
 	rm -rf "${ED}usr/share/dracut"
 	use test-suite || rm -rf "${ED}usr/libexec"
 
-	if use rootfs
-	then
-		doinitd "${FILESDIR}/zfs-shutdown"
-		exeinto /usr/share/zfs
-		doexe "${FILESDIR}/linuxrc"
-	fi
-
 	newbashcomp "${FILESDIR}/bash-completion" zfs
 
 }
@@ -102,7 +95,10 @@ pkg_postinst() {
 	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
 		|| ewarn 'You should add zfs to the boot runlevel.'
 
-	use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
-		|| ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
 
 }
diff --git a/sys-fs/zfs/zfs-0.6.0_rc13.ebuild b/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild
index 49bb81348a5f..54ac1bc82560 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc13.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc13.ebuild,v 1.1 2012/12/23 05:44:24 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc13-r1.ebuild,v 1.1 2013/01/05 16:21:37 ryao Exp $
 
 EAPI="4"
 
@@ -86,13 +86,6 @@ src_install() {
 	rm -rf "${ED}usr/share/dracut"
 	use test-suite || rm -rf "${ED}usr/libexec"
 
-	if use rootfs
-	then
-		doinitd "${FILESDIR}/zfs-shutdown"
-		exeinto /usr/share/zfs
-		doexe "${FILESDIR}/linuxrc"
-	fi
-
 	newbashcomp "${FILESDIR}/bash-completion" zfs
 
 }
@@ -102,7 +95,10 @@ pkg_postinst() {
 	[ -e "${EROOT}/etc/runlevels/boot/zfs" ] \
 		|| ewarn 'You should add zfs to the boot runlevel.'
 
-	use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \
-		|| ewarn 'You should add zfs-shutdown to the shutdown runlevel.')
+	if [ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]
+	then
+		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+	fi
 
 }