Remove no more supported command "zfs volinit" from the init script for -9.0.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 52 insertions, 3 deletions

diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index ad239c5488d4..73634cddcd12 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-cddl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.20 2012/04/26 15:38:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.21 2012/05/12 07:57:13 naota Exp $
+
+  12 May 2012; Naohiro Aota <naota@gentoo.org> +files/zvol.initd-9.0,
+  freebsd-cddl-9.0.ebuild:
+  Remove no more supported command "zfs volinit" from the init script for -9.0.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> freebsd-cddl-9.0.ebuild:
   keyword ~amd64-fbsd
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0 b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
new file mode 100755
index 000000000000..5086680c45cb
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/files/zvol.initd-9.0,v 1.1 2012/05/12 07:57:13 naota Exp $
+
+depend() {
+	need hostid
+	before fsck
+}
+
+start() {
+	einfo "Starting zfs volumes..."
+	eend $?
+	# Enable swap on ZVOLs that have org.freebsd:swap=on.
+	zfs list -H -o org.freebsd:swap,name -t volume | \
+	while read state name; do
+		case "${state}" in
+		[oO][nN])
+			einfo "Enabling swap on zvol ${name}"
+			swapon /dev/zvol/${name} 
+			eend $?
+			;;
+		esac
+	done
+}
+
+stop() {
+	# Disable what we had enabled before.
+	zfs list -H -o org.freebsd:swap,name -t volume | \
+	while read state name; do
+		case "${state}" in
+		[oO][nN])
+			einfo "Disabling swap on zvol ${name}"
+			swapoff /dev/zvol/${name}
+			eend $?
+			;;
+		esac
+	done
+	einfo "Stopping zfs volumes..."
+	eend $?
+}
+
+restart() {
+	:
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
index a530c81fe2e1..0d57fd42ee85 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.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-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.4 2012/04/26 15:38:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.5 2012/05/12 07:57:13 naota Exp $
 
 EAPI=4
 
@@ -66,5 +66,5 @@ src_install() {
 	gen_usr_ldscript libnvpair.so libumem.so libuutil.so libzfs.so libzpool.so
 	# Install zfs volinit script.
 
-	newinitd "${FILESDIR}"/zvol.initd zvol
+	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
 }