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

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 43 insertions, 128 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/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
 
 }