New init.d script to start zfs volumes and swap.

Package-Manager: portage-2.2_rc67/cvs/FreeBSD i386

4 files changed, 62 insertions, 14 deletions

diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index a032eea9a669..f11fb5d6beef 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.9 2010/03/19 11:50:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.10 2010/04/04 21:04:18 the_paya Exp $
+
+  04 Apr 2010; Javier Villavicencio <the_paya@gentoo.org>
+  freebsd-cddl-8.0.ebuild, +files/zvol.initd:
+  Add script to initialize zfs volumes and activate swap when required.
 
 *freebsd-cddl-8.0 (19 Mar 2010)
 
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 0b1903486187..5ea54a4d86b2 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX freebsd-cddl-7.1-libpaths.patch 3739 RMD160 93f97c9d820bc875954ab2b18268a7cc4f107a4a SHA1 ca17300a24df00cafcc4e990dd7727375a2992f5 SHA256 f07e90c67926b5ff1af3b1839797fd95f7eeecb7ec5cd938bb3eaf598de05287
 AUX freebsd-cddl-7.1-xdr_header.patch 380 RMD160 84ca8934581eb1e7728b690edbf0609ac5862265 SHA1 e107524735127ee5b290c64aab786e743e583134 SHA256 cb9d14f3770866c3d07d9aa09067428f0f1de432a7ac60567f57089a43704762
 AUX freebsd-cddl-8.0-libpaths.patch 4418 RMD160 5d21119466909363012ce062a2525d4a7a990b52 SHA1 d01a290b365624e5ddee879fc7347e0ad8b747dc SHA256 3fa5555254ae38a0e6d4e1385e2dd2b4ea0f84ae326f3941c69726cdcbe3a05c
+AUX zvol.initd 953 RMD160 800150a45778c377b5a457346ceceb8fd61c665d SHA1 d217a89153f5155d7225e443dce2982a7b6b4a83 SHA256 3cc5d065cbe664083b9f40eb3584fd48ded5b1e2ed16c8c4e1719b59879cf3bc
 DIST freebsd-cddl-7.2.tar.bz2 696078 RMD160 44aac7c838c53f7d4b418bae204e7b1d66ba03e7 SHA1 1b8bddf95aabea8ef3db4a850675dab1a9a1b87f SHA256 bb9551c48c34c1bc51f31fbfbc2ac781eca595026e3f981a145e3c781f6e1086
 DIST freebsd-cddl-8.0.tar.bz2 774011 RMD160 bd4d595a18afc51e68ee0db0b55a4043c9770ea7 SHA1 efe03cb40ecb1a9150c0800c052992c8ffc9103f SHA256 46a863d910e7a193435ab29d993635a07503052e52acdfb5a552915ff1dddb1a
 DIST freebsd-contrib-7.2.tar.bz2 41156304 RMD160 d32da79d66aa9e5cd113bd7b3a16b7d83849dca2 SHA1 8f3778a1638bfe852f95d746d181a56258446182 SHA256 e6b5b4320552185d64a1d17676ca4376ca43f147eafaee7e2b0885571e4ee1f2
@@ -19,13 +17,6 @@ DIST freebsd-sys-8.0.tar.bz2 22552771 RMD160 08f5b09dc0b4353658a309e9e1198dbab1f
 DIST freebsd-ubin-7.2.tar.bz2 1851174 RMD160 b56cdc06fe0ce1ea47762a75c33ed9ed6d1abfde SHA1 1739eceebc41d9a4cbf10d21ef4e8d55b586f640 SHA256 5ca9f185a5af59993ddf83ece155bfcea1340a93d2540035b35c5acbfc3a2625
 DIST freebsd-ubin-8.0.tar.bz2 1787358 RMD160 08814da95905ba2cd6037c41507eade30b007e72 SHA1 0de52ddd7522b73c876ed967ac96aa278260f5b6 SHA256 2bd1529107e3b70df64bc4d7d3117122cac03b49b874a6653860b13d567af250
 EBUILD freebsd-cddl-7.2.ebuild 1415 RMD160 5a5ba653593bc52117d844ef2e7504596e59b0fe SHA1 17fb158ba99fdbcde89f36317a1f5dadef0a4cb7 SHA256 524ebbfa57f1cbcc9a282e05b2bad47a48b7277e4a3dac30388cd43fd681466f
-EBUILD freebsd-cddl-8.0.ebuild 1179 RMD160 4bbf7ad997f389f14bc27e6bde4fd2bf290757e7 SHA1 02c5e7b727366377fa018b31a77193afd1d58cdb SHA256 ff163ee256482777a2c7583336dc7f35f903fffa19fa4cffbef2d6d31c79c5ea
-MISC ChangeLog 1575 RMD160 ba8f596a7e097d986e2dd73e240f3893fa31c359 SHA1 b738cd5449b608ded80f6ef872da9b27efe7c30e SHA256 8940393b1ecadcf1483417f44f7f38c3a4fb26f1d01c398d264584c5e46050e7
+EBUILD freebsd-cddl-8.0.ebuild 1290 RMD160 32123bd1521f5e43c12157e7374e13062963ddb6 SHA1 6ea0927b177f036e5dbfe6f2272640b58e17b9e1 SHA256 fcc3d6777c67c418d05327d3c92bb012fe40cb0eb250cbc715a4825c1bc41019
+MISC ChangeLog 1753 RMD160 21e06e05a02ee1b233d65e7c84083340e5c20658 SHA1 4e60d31634899671f75f364938b47c207f49d63c SHA256 3b64702ef394d940af6bb538166a267c3daa34680461d1a9912a9d98bb40b8fe
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkujZUUACgkQvFcC4BYPU0qRpACfSS5h20d4vRQ0+QZZ5egsfg86
-yhsAoJqCSnJS2sNmOawvUgXJDyGXTPhm
-=4Ywc
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-cddl/files/zvol.initd b/sys-freebsd/freebsd-cddl/files/zvol.initd
new file mode 100755
index 000000000000..31c85cc273db
--- /dev/null
+++ b/sys-freebsd/freebsd-cddl/files/zvol.initd
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2010 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,v 1.1 2010/04/04 21:04:19 the_paya Exp $
+
+depend() {
+	need hostid
+	before fsck
+}
+
+start() {
+	einfo "Starting zfs volumes..."
+	zfs volinit
+	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..."
+	zfs volfini
+	eend $?
+}
+
+restart() {
+
+}
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild
index 5ba1ed32ce44..b8d52a60d30b 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild,v 1.1 2010/03/19 11:50:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-8.0.ebuild,v 1.2 2010/04/04 21:04:18 the_paya Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -41,3 +41,9 @@ src_unpack() {
 	# Link in include headers.
 	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
 }
+
+src_install() {
+	freebsd_src_install
+	# Install zfs volinit script.
+	newinitd "${FILESDIR}"/zvol.initd zvol
+}