Make zfs-shutdown script a noop on systems that do not use ZFS as their rootfs

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

5 files changed, 22 insertions, 5 deletions

diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog
index 128379e10af6..f2c5574fe5bf 100644
--- a/sys-fs/zfs/ChangeLog
+++ b/sys-fs/zfs/ChangeLog
@@ -1,6 +1,16 @@
 # 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.50 2012/11/14 21:57:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.51 2012/11/29 05:19:12 ryao Exp $
+
+*zfs-0.6.0_rc10-r2 (29 Nov 2012)
+*zfs-0.6.0_rc11-r1 (29 Nov 2012)
+*zfs-0.6.0_rc12-r1 (29 Nov 2012)
+
+  29 Nov 2012; Richard Yao <ryao@gentoo.org> +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_rc10-r1.ebuild, -zfs-0.6.0_rc11.ebuild, -zfs-0.6.0_rc12.ebuild,
+  files/zfs-shutdown:
+  Make zfs-shutdown script a noop on systems that do not use ZFS as their rootfs
 
 *zfs-0.6.0_rc12 (14 Nov 2012)
 
diff --git a/sys-fs/zfs/files/zfs-shutdown b/sys-fs/zfs/files/zfs-shutdown
index 17791b67cfb1..d7bba30ae8d0 100644
--- a/sys-fs/zfs/files/zfs-shutdown
+++ b/sys-fs/zfs/files/zfs-shutdown
@@ -1,4 +1,7 @@
 #!/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"
 
@@ -28,7 +31,11 @@ start()
 	MOVEFS=$(df -TP -x zfs | awk 'NR>2{print $7}')
 
 	# Make sure that we are dealing with zfs
-	test "${ROOTFSTYPE}" = "zfs" || eerror "rootfs is not zfs" && exit
+	if test "${ROOTFSTYPE}" = "zfs"
+	then
+		eerror "rootfs is not zfs"
+		return 1
+	fi
 
 	# Construct new rootfs
 	mkdir -p "${TMPDIR}"
diff --git a/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild
index 938fc8402fde..d2b03867be50 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc10-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.4 2012/08/31 18:07:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10-r2.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
 
 EAPI="4"
 
diff --git a/sys-fs/zfs/zfs-0.6.0_rc11.ebuild b/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild
index 767772753725..2bd803e46d22 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc11.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.ebuild,v 1.1 2012/09/18 22:33:46 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc11-r1.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
 
 EAPI="4"
 
diff --git a/sys-fs/zfs/zfs-0.6.0_rc12.ebuild b/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild
index 7095d042fb09..c8f43abbd3ed 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc12.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.ebuild,v 1.1 2012/11/14 21:57:19 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc12-r1.ebuild,v 1.1 2012/11/29 05:19:12 ryao Exp $
 
 EAPI="4"