fixing init script for bug 482522

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

3 files changed, 24 insertions, 19 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 177fb7fa09ca..8b1ee0202c1d 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.16 2013/09/12 04:47:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.17 2013/09/12 06:27:28 prometheanfire Exp $
+
+  12 Sep 2013; Matthew Thode <prometheanfire@gentoo.org> files/glance.initd:
+  fixing init script for bug 482522
 
 *glance-2012.2.4-r4 (12 Sep 2013)
 *glance-2013.1.3-r1 (12 Sep 2013)
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index b36ae29ec077..b4720fa78787 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -4,29 +4,29 @@ Hash: SHA256
 AUX glance-gbug-474064-folsom.patch 2357 SHA256 1a8cd2bc81de9d8149590b0f11a30d13928740ac1548ab4a5e934a311f1b0d18 SHA512 7a2005899c88cd29ef1be1b3c6119767ad2ba62b878438cb4aabecea677579c65c654526ba9afac8c73016d6b8085a6fad0016167d06437087abfc8e0ab26bda WHIRLPOOL 497a415c7c1d09075ca0e809f7dc75b2a4147bcdf53e6ccb64e439d507972dfd7336e69f980f9673ce59e1047adb5497351386bdeceaec53022a79a417c129bd
 AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7f3f08118e6129e45b0e5bf5fd26c7aba1 SHA512 a284b6002c3b4ae39678eb0c492b3adb6311b115761ef43f38427dc08670c0ebfb4011a3879291ee6acdf9480ca135b4cff77f41b7af9fe7a837effafba2c6f0 WHIRLPOOL 8adfcc80adf72b501a7123c29454c446b86c05917cc8a910f799db5c223fc0efb02240f36b842c05c08e8347ae6d6273ddfa088a03f0f65eee0cbfc40176c9c2
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
-AUX glance.initd 1276 SHA256 030c10e8688916024eef7222d9f801f2fad2204c160ebc5898e3f764bc96c353 SHA512 4514ce8df0b96e1dbd51df4c55d79cf55122957199488dcfcdf8699de3f919b58e81609cc129203d62c2fd706865463ad480ac3cb50bd151471594171532cdb0 WHIRLPOOL f82ba96f3429c937e9404e0f4ceb643b05c32d127757eeabd5f0d0790eef91a62a11978a237cc0fa1abfd2246b811a9d61e03247ffb6320ae145d7ab9a2515b8
+AUX glance.initd 1299 SHA256 d9988dbc3b25a72188464a1b6eb71b50d1ac4143c54db89d42fd0be952469957 SHA512 e3666fc6af13df1b225227c2713e496bdfabc7ebc9349f5f671e2e10c9e1de054e927d55cde641429dd73b05332a171544270df7ab8033b7487dafea54ed7fde WHIRLPOOL d16a3446aeca8b4c4c07dd3c7cccf2d84495ec12eac11646180a4778dbf0956cf58fde67b83de6a3ed164c5c1bdf5b0339220dc847b067f2cff800e9c511fea9
 DIST glance-2012.2.4.tar.gz 643408 SHA256 d50fa522e890258eff32aad1947684abdf0cf0c67a8a487f60a7179a84edd3f2 SHA512 fc91d799fa5fd2c66aef228d622c852623e70fa83e5babdeb10e041f77571e5a08c90c6fca16943dc98ca1cd50a09314fc5bd282e5530e7e1e44a623eee28198 WHIRLPOOL 34fdfab54444845ed4a3c0e849066f01ef88cf4317d952a0fedf562f331a41c87572d80234296651a722770929472de9263f7ded37deaaf6d65f35723e41031c
 DIST glance-2013.1.3.tar.gz 721788 SHA256 642782416d790dfcb6d5bb85626dd5d48784ba8f3a53e7863ec13312e86cb209 SHA512 260bd30555bbc4f9d170c4d542bd159039558f563da55f896095323cd0369f0a10f5b8d5ff52b9c1ad3b6fcc867a54a8ef276f35ef9e65cbc0083733de3e5643 WHIRLPOOL ad2d62004bc95033dc0031df426a508942466a432cd18de2e3ba9e89723357b880c69052badae32fde224b9004606cb667e98a1c63e74b182bfb1b308c2fff54
 EBUILD glance-2012.2.4-r4.ebuild 3037 SHA256 f398b95d3fc89f70c9df63ba2203418c663b592321a5d8f83b746761afd88901 SHA512 0a03ab6e6eb3dc71f361d8271773c2b8c3bbcd4f779e479bdda4f54dd9ed0b05e4cfa1446758bef269dae6bcf3acd6ecfb646c01c7dd56cac5b7522950d4819c WHIRLPOOL 9e27596c1019e48c69affc0f76a13b288f6357483c2ea1bd9e16966be45b1a26b09e3495cbb51f804e9cc1524cdb4b5e102f6c546e8f1980899f3997227abfe4
 EBUILD glance-2013.1.3-r1.ebuild 3051 SHA256 84fa2485e7d929e6d3e05f0dee0737cd37e5bbbffb6d7575ceab6e337ce7dddd SHA512 140d77844820fcfaf53d0829e408f6802744c058978b82897e6dd4c43ee25b1442ecccac576b628fdb849d50ac19207eca04276c6dc3a19d9751356238a4562f WHIRLPOOL dec581e5dd1de2ba3fe5fb1f3f997744a26f75044cc3966aa5f92bd67cebfa4c19dc466fe421137f8c9499c764ea15898827b0132ea63c4d4982c6c1ed35ba36
 EBUILD glance-2013.1.9999.ebuild 2995 SHA256 aeaf487c935046ac693315d01a6a434135970dd1901b8bccfde258f8b5af0576 SHA512 ca709e0bc38d39e8e526e8179271f829c70ac879575a07a007158aeebb5eac23d48c721955300de4f3e88689ab073c5af59a6e11be5533d5083b2e71fd1e8bbc WHIRLPOOL 3193264255430dfd912e66aa97f32a2307e5ed4b3447dc5e99b69861c5dcb66bdb1bee4fed6d3e739bb7866488a1cb8361272042b2a53a0a47ded57cb1f6c5ee
 EBUILD glance-9999.ebuild 2980 SHA256 6a74d2db7d1011589d649922e49c7476272194c0f36deea7c2c9e7cf0b4c4241 SHA512 e477e3857b7949e39ccd7e61235add11dadba874efb18d52797f4cf5130e17b6ddb781a9664d267b7595227dd3bedd235fa5b8acc253abe35edf464f179801bd WHIRLPOOL 8e1e8dcd57034d2e20851e4ea6804b5258953350d9825813fe15a4a55ad0335ce7f565ab9610aaf49ff3d4722062cb24b08b5ca11b6eba06c88e661e57592516
-MISC ChangeLog 3920 SHA256 0db4cc51702d1a1e100a058909456b02e391fd5431c375ef79ad28d24041f84e SHA512 42375243381874243585be163f3b408917dd7ecccf0ab033ee9dead77c174d87682f4c6cc49e07ce77332e7de6a75eb2b5c40321e4dfd3fb87bae6518ec2a6cc WHIRLPOOL 1ceb446b296012ef814e416410ceb8e634ddf0cff51fa9b680e1fc755314893f3120956c8c814be6cc25a1c6cb220814884b20bf33ea09d500fcf6cc8e97e2e2
+MISC ChangeLog 4034 SHA256 dcff5637d8b94f2dce9b81efb90e655bfce30825a0d57bb0b7267c57d47d79c4 SHA512 4dda9c2548564c7bdee6f601ce4fc0e0f5a131851dfc533afa20f51f458ed91933dfed71eff243491cf06526082e7121e4ee55f04c8130ca37cde1f6ccf4fe1e WHIRLPOOL fd0315f0079885d147fea59ba016d4e879d40e760481aee2ab73e8d86beda09b14d21b7c4c8339f0d8f52130259cf604226daf89742ccde3455e0a4c92fbaf3b
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSMUfRAAoJECRx6z5ArFrDMTkP+wQKxl/39ocOMrL+uKk2lp12
-cUgy5/rbwTfttXw5LP+qTRdeXvmphWDMgztFaawx/r+LRgSMyBuuSmxQam2dcGxF
-ytDqjZ8k0wjRTS/cw/AX3fbDCdYABwiLAdkT3yIt2xQ9nykIcoU7Dbf0mm0T+pVV
-I+HiyDsgy9GHJcD3AXZmVrgRylH5Ab7OSsPQ0PoLkNwwED3pEz5ZB2MT9vToIhmx
-7e8hSNRwPj0MB8rjTP6M9O6C0hQsdLiLiA++d7T1jnEN2v/haZWzaCHDSVpQPV4F
-WDqsXiKC4RMB4n2S3pSCFAs95nGzDS68nRKplo+FEY6f3oLA5us/VRz77UFoY56Q
-Rdyqg36BnDixn/9n1feRX2zDtvYj7PdKNTSlK8guOEnvXLU8zkWU0ziYR0BBPeZR
-+Nbx264mqf9RfU3KN95wuKzqGF5WcBab+8HrGP/zTPPwYv6m7cfWi/WP7nNNpPLW
-H7oJO2p5YGsQQjdnavjfQinwZ8eetrjm0ertmp97hFkxMv4O96meRwjTEoivNdSO
-Yh1r6eqF0BpnhmzjkdDXAJxm1MLBrnOOQVWYuYDFsL1b4KfvHyD6CZqyXNsC1fEG
-EfGUsEls4cB/KQpNkPOYpRoP5YnOsTYcDJo5pJSFFqGBGO/QkpzZu4lwwFJmfigf
-ok8Da1mBHPJcSlJejozU
-=5wdv
+iQIcBAEBCAAGBQJSMV82AAoJECRx6z5ArFrDpm4P/RKrQYhglGELzvr+qKzuy85v
+F5p0CYtQwQH4FPv+PP4jKdNVT7fhWIfOPuLDf0EOvP1h6F0u+V4p+V3GX1djKuQe
++/S64aO4e6x72427JhdPziB+5EXq+nTgDk7Mo0n44IN31hk8c0s09WW6eQAfu/Dd
+1n9vr0N31w5rbTdQ0dJ+0Sjy4ML93TceTi2fuwi9zWhqU4DFHDxCa+9xW99E8Zn5
+skvc6/pkVIOllxD3+iarWwmE5+tgI4H1HkkaBZv/Y9xV0cZ98awAny0c44M42VU0
+A2csH/ttlQtW5DHtO6FoD1Natmdy9iCcqqhtwU18f/7ljIk6E/cGfC6mUuRzQAxJ
+NkZIAoFqmcYBXC7MzoOScz7YRJnnjYIipUB3YlKz6MxaFSMM4ilCQWEuRTYbaljn
+UGjLz+0YuSNlFd8MmYCUzGggeCPWiV2QjyNHSjjF8Ocbe8dRdjbcymSRtKsZjKeA
+kYp1C3xhWxXgdjRZqJU7K9iZ2jmL1SwC8ClHWxURpA5qxKGnC7wsyOf2/CWYxy6L
+D1NTNUsInyIXl2GyYjhcg3dq6mDy0rF7DqAExGI3FeC4eNiCbQKrcSVT27YgKuiB
+NVAm5Euh44KWhGzwXRrVHGT1bMbwCP0aUq2q9zxJbTUom8wBo5ko1E3q3q0HYRg7
+SxSNuiKvNzuZbrrh2LA2
+=UYDf
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/files/glance.initd b/app-admin/glance/files/glance.initd
index f02a36b7cac5..48b3da5d5bae 100644
--- a/app-admin/glance/files/glance.initd
+++ b/app-admin/glance/files/glance.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.2 2013/07/02 15:33:34 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/files/glance.initd,v 1.3 2013/09/12 06:27:27 prometheanfire Exp $
 
 depend() {
 	need net
@@ -28,9 +28,11 @@ start() {
 	. /etc/conf.d/$BASENAME
 	
 	ebegin "Starting ${SVCNAME}"
+    if [ ! -d ${PID_PATH} ]; then
+        mkdir ${PID_PATH}
+    fi
 	
-	start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCENAME}.pid" \
-					  --exec /usr/bin/glance-control ${SERVERNAME} start /etc/glance/glance-${SERVERNAME}.conf
+    start-stop-daemon --start --quiet --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/glance-control ${SERVERNAME} start 
 	
 	eend $? "Failed to start ${SVCNAME}"
 }