Enhance ganeti-2.1.x init script so that you can pass options to the daemons easily

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

5 files changed, 35 insertions, 10 deletions

diff --git a/app-emulation/ganeti/ChangeLog b/app-emulation/ganeti/ChangeLog
index 2b09cfbdc937..758301a774d2 100644
--- a/app-emulation/ganeti/ChangeLog
+++ b/app-emulation/ganeti/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/ganeti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.16 2010/02/06 22:51:21 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ChangeLog,v 1.17 2010/02/08 22:38:59 ramereth Exp $
+
+  08 Feb 2010; Lance Albertson <ramereth@gentoo.org>
+  ganeti-2.1.0_rc4.ebuild, files/ganeti-2.1.initd, +files/ganeti.confd:
+  Enhance ganeti-2.1.x init script so that you can pass options to the daemons
+  easily
 
 *ganeti-2.0.6 (06 Feb 2010)
 
diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 619f74819079..54bc33396ea8 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -3,7 +3,8 @@ Hash: SHA1
 
 AUX ganeti-2.0.3-gentoo-brctl-path.patch 741 RMD160 2e97a68618467ba700fa97d3fc250e6734570c35 SHA1 90d414b327fa4a61850a8f11fab6ef9bd8cf437b SHA256 8362692d1af5b264a9681d63137bd010be29047419718b8daaa320dfb0979965
 AUX ganeti-2.1.0_rc1-fix-brctl-path-for-gentoo.patch 1041 RMD160 fc6a76737c923e25ac918a390b4b1881313f95b1 SHA1 4edc7135756f64111933bac23879b0cce50cb864 SHA256 ec597d86558bc8f5205afeb55f4fd1f7aa016f2482dd7f31935628ef0ae1e3c0
-AUX ganeti-2.1.initd 1743 RMD160 21a9579da7e9a9ad2527583bc60a7fec111b3bcf SHA1 b63acba5411ee4ad1664113b7ef22d4b0885ffd9 SHA256 c4819750fa99b06bca3eda752a62b7fb2c89605493d32596fbbceeb7f1e37db4
+AUX ganeti-2.1.initd 2019 RMD160 045359864f0e334f0badc8cddf335b4e29357d8d SHA1 464f3ecbc1209e0c382c96884564989e362e9273 SHA256 8a3ef7c44cc9995161959498f578a1330e8a20e6cf1b687fb3f58af34a8d9325
+AUX ganeti.confd 248 RMD160 18662964365f102e77f593429bb0772d94c65267 SHA1 337999b3fbeb64518f3d39c41634e3f414aedb25 SHA256 7efc3a5052ad5c2085605a8c0bf9e9bb9cf20c0623263b7abcd0b7a0cb9a895b
 AUX ganeti.initd 1117 RMD160 763bc5795ac721d1616c435e1e087c3f5279c338 SHA1 ffeca91d3f4f26e775ea9de4c6b406e712aa317e SHA256 ae65bfb27f6cd6e261af0e130f5906185b9f9d6413c8319e989609a35d37172d
 AUX ganeti2.initd 1503 RMD160 4af84c353f6638af31a94a5274e922237ae2fd00 SHA1 a46268352d11fb6450362c9a0d72655ded6b5b6f SHA256 6fd666648ac543ffcc3700821a36eba9a027eb04278e53f60e07ce8989de3fb8
 DIST ganeti-1.2.1.tar.gz 614274 RMD160 184b59dfdf51ec7eac746746ca6953749b963cb1 SHA1 c82140a68762464c0ec67bdb2773bddf66211491 SHA256 b0c414fa0dacbd55315711cbf38670f5693f84cf7fc02d5b3a9465cc2146c571
@@ -17,13 +18,13 @@ EBUILD ganeti-1.2.9.ebuild 1184 RMD160 a5a134cb7dec0599845d544f3637cce9c36b9413
 EBUILD ganeti-2.0.5.ebuild 1762 RMD160 16540a00486a5715f81055aba5ab6a4c5f8afd1d SHA1 d5371fc235ecfb8b6fdd7c9f0a47e0e3a7b08298 SHA256 1daa44848d5dc3863a611722f4d71ec64e3e3f5da041fc35c71339fead7242c8
 EBUILD ganeti-2.0.6.ebuild 1762 RMD160 9408c5ce24e0a45be716ee7372a316c0f5a83e92 SHA1 129ffac81161c0e1598ed0cf2819c992b210e392 SHA256 acd454d76f642b5f388b2effb0cead5d0af44d6231a1dfa915feabc4671f334a
 EBUILD ganeti-2.1.0_rc3.ebuild 1933 RMD160 1582ddab1135e4679fa8d2f41189ed49783c38ae SHA1 f6f72466599c4d60a26f2f143ffb17deb331b30a SHA256 fed2150f6f761749e178671948c0b0d493a445e82c1514a384a1b88261230d4b
-EBUILD ganeti-2.1.0_rc4.ebuild 1933 RMD160 634c9309e5eaf5cb48b2c8d5edad84428f8a089e SHA1 9726b5f0ad871c539e20c75c49123dbea48d9d79 SHA256 02757cbab0831caeb5f3a90f23d33334694603ee0673fd524dba7e1f25ba31f0
-MISC ChangeLog 3082 RMD160 1b6b7f1459d1880b47c0b47511c017b0689bcdd2 SHA1 3c2ef23979b7e0ec66905e794f72f879505cceef SHA256 b048d1927b8e97434af4f45725f1a9ccc6c8d641802b9c52db031ace7eade3cd
+EBUILD ganeti-2.1.0_rc4.ebuild 1977 RMD160 2dfbae6b3dd7f94bace0926f795d54d0cfcad95f SHA1 289c3d2ae4cc684e8e81cf5635e021b66f3008f5 SHA256 065dcd218e7524ae7b2ce3b28eeeff5d1c7aa6a832ca95f95f92b8d8756a5a8a
+MISC ChangeLog 3296 RMD160 a8316cead1363f4b97eb445ef68da53bfc8a81d9 SHA1 2e23860f959efb578edbf5c584e64a2efe4a9778 SHA256 ff996ad7970d93184879940e545f4e10cfe7183037ec2a78b07b5f0f1b954a04
 MISC metadata.xml 1187 RMD160 c4f4fd250ec9b7b8fb4738a8d61c09f2af01d3a0 SHA1 921024500dae363c3e73ba565d3300a000f1772c SHA256 e6a405062ca4862abc506bd8fc0138403976c0769dd25ddcb4b737507bda9404
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFLbfI3QW+hXSf0t0IRAradAJ4tifN5BddNPy/Tv5inEhF/nlsuawCfaZq2
-r5DAKu9wB3T4AZMoK2lIYoQ=
-=9WKR
+iD8DBQFLcJJKQW+hXSf0t0IRAtZEAJ9k+dQj4wehHgzoNgsuHvNWkcJgqgCffcH0
+r3XxIgh4obfShh1PtXFNAn0=
+=aorR
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/ganeti/files/ganeti-2.1.initd b/app-emulation/ganeti/files/ganeti-2.1.initd
index 743c5cdb9c81..71c840212836 100644
--- a/app-emulation/ganeti/files/ganeti-2.1.initd
+++ b/app-emulation/ganeti/files/ganeti-2.1.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti-2.1.initd,v 1.1 2009/12/17 00:47:16 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/files/ganeti-2.1.initd,v 1.2 2010/02/08 22:38:58 ramereth Exp $
 
 depend() {
     need localmount drbd
@@ -70,7 +70,15 @@ maybe_do() {
 start_all() {
     check_config
     for i in ${NODED} ${MASTERD} ${CONFD} ${RAPI}; do \
-        maybe_do "${1}" start_action ${i}
+        case "${i}" in
+            ganeti-masterd)
+                GANETI_OPTS="${GANETI_OPTS} ${GANETI_MASTERD_OPTS}"
+                ;;
+            ganeti-rapid)
+                GANETI_OPTS="${GANETI_OPTS} ${GANETI_RAPI_OPTS}"
+                ;;
+        esac
+        maybe_do "${1}" start_action ${i} ${GANETI_OPTS}
     done
 }
 
diff --git a/app-emulation/ganeti/files/ganeti.confd b/app-emulation/ganeti/files/ganeti.confd
new file mode 100644
index 000000000000..b79a27815c12
--- /dev/null
+++ b/app-emulation/ganeti/files/ganeti.confd
@@ -0,0 +1,10 @@
+# /etc/conf.d/ganeti: config file for /etc/init.d/ganeti
+
+# Extra options to pass to all of the ganeti daemons
+# GANETI_OPTS="-d"
+
+# Options to pass to ganeti-masterd
+# GANETI_MASTERD_OPTS=""
+
+# Options to pass to ganeti-rapi
+# GANETI_RAPI_OPTS=""
diff --git a/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild b/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild
index 6fcb8871fee1..1c42c50b2d6e 100644
--- a/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild
+++ b/app-emulation/ganeti/ganeti-2.1.0_rc4.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/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild,v 1.1 2010/01/31 01:55:10 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.1.0_rc4.ebuild,v 1.2 2010/02/08 22:38:59 ramereth Exp $
 
 EAPI=2
 
@@ -55,6 +55,7 @@ src_configure () {
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
+	newconfd "${FILESDIR}"/ganeti.confd ganeti
 	dobashcompletion doc/examples/bash_completion ganeti
 	dodoc INSTALL NEWS README doc/*.{rst,png}
 	rm -rf "${D}"/usr/share/doc/ganeti