Fix the init.d

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 0xA5C1A1D24B128E52

3 files changed, 22 insertions, 19 deletions

diff --git a/net-misc/i2pd/ChangeLog b/net-misc/i2pd/ChangeLog
index 65261d8..8b2713c 100644
--- a/net-misc/i2pd/ChangeLog
+++ b/net-misc/i2pd/ChangeLog
@@ -1,3 +1,6 @@
+  30 Dec 2014; Francisco Blas Izquierdo Riera (klondike) files/i2pd.initd:
+  Fix the init.d
+
   29 Dec 2014; Francisco Blas Izquierdo Riera (klondike) i2pd-0.5.0.ebuild:
   Another artifact from multilib tests install_all should be install
 
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index a9f49fc..6c7aeca 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -5,22 +5,22 @@ AUX 99i2pd 44 SHA256 ecc85329d663182165bf6b5f672237a9f4f129f39f168d38c876345f3b8
 AUX i2pd.1 3568 SHA256 713a40b5fe6c6fb40a7c1ee4e7cc4e7c5cdd9cde88a01651357c6b744168983d SHA512 523d2823c0ddec83ed650cc4c61e4965c3985d7399c73679e68d27c675924715bf86c22a3335ac97e963095c1db9c199da3a74ddbddc3110289561194e06d109 WHIRLPOOL d9b2ab16cf8da0330f0b88740496a5c2f5221f83daeabf493faafa6b4d010bff01da160547e7b3e513c88a1642e98531858f0a5aa2a357c25f680ec0b779fce9
 AUX i2pd.conf 32 SHA256 723d883dbdc9cdad64d58db65d29f48f63b9402d9af6ce81bc2c17cd0e250e02 SHA512 426c141445a84dcadf38f0321c68e0c851b9f01cc40858a217ef5e8202fee446f250dbeeeeef22a48086628ee8b4f8ea7683b3f936ce70fa6c28d29eee4271f8 WHIRLPOOL f5596d54105052b996bc0fc93937f92ff7eb52b3c8290c1eae51a45b54a453cc6b83acc49dfaeab30947807bcbb312ee1fd4a8ed1b38a11402a2e54a8ffd4075
 AUX i2pd.confd 176 SHA256 9021447caafd6193a5a87b12d815facf8608d37e0af3e6ff934975f255811385 SHA512 706be4b5c7c1f14222129ec079294fa99c8ee024fede18a64d6d117bf7982e1bc87b19544bf46ff139caad18dc4d592275f7f73171be5abd140909a72c0a14ed WHIRLPOOL c71d2055a64bceb9f4e31415e306e14453f5780874744142025c5c97bb3519c06bd50fcd3ef2b839932cedf313dcd171fe8c77d2d55ee46c74ee247b02e69235
-AUX i2pd.initd 472 SHA256 94bfa1638141b8d5595e814cedb3ed828aade088f9c6f8fb7e703a1af37df88a SHA512 4cd191d0256cb8ee325c18e62c7cfad3a1117cee96ff83bf8987e5efb8574742993410a4f96083969860a88f6575ca3489ae6cba4035dcc3d7787b8c246b274c WHIRLPOOL 8b5b872fc17966c0cc5fe5ee0bd38bf29f4c6a54e22d0ea9a44036043248d04f01f87c3668e778e6fe812f1b3c4f499c1b124c54fb288941a0d7e898cb0a1c10
+AUX i2pd.initd 629 SHA256 581e5d914ba16d542af7019de0c6a4556521de7525f5821357fac7a59767774f SHA512 3332e0357cd68fb72d21f66c24ef0bf888b349ab898992a85fa78e389857da2f94df8e950fb5e23ff43546aeb06ab34dd725f9507d2e34808821c215b707f944 WHIRLPOOL 35c12a12ef50b387e3bda5969ba51c0dc8cc7e225b139154f90cc69f5ed9dd1580d03bc273df54ddac7ddb6910ef28cd4606eae1da3b19a81475d5fa8db8a6dd
 AUX i2pd.logrotate 270 SHA256 cac89d98a0c2eff2eeedb323b3b81c3e316293f80d3397bfeb833f700e98b691 SHA512 08a944576f3f103ef7206e5e09ad7256f79254097d389b955271db9a8e3781332d9ac564cef06a7bb6c3837324abee3035cb18588470f43861310e886c4f7075 WHIRLPOOL 79096ea93a446240d84bc65930e0746f8fae203303d9309a1a345a1818c11525d782f51dd7200f55d5f1c79b79a7d43c9d1a510225aa5bdf522baf4884a45700
 AUX i2pd.service 399 SHA256 6fa9a8a00e9831c824cf049ebc245ec65510d19fa65e7f8a352f88b0433115d4 SHA512 353e33254ba2d7bc8b6ebc5551ee1bb81ccbce97667018c5b6341df154d1d734cad09a2a1e0bc8b05132020aca92e98783e6719176d1306e1984bd86a4d45f65 WHIRLPOOL fd0bb4b15449d1a892c62a4aa1015cec4ee8c8af38e2b263e654200938af15128b444ee2a79ff2fc6ba83801d21385a09b779dc45d53e9060f4aff250f6e760a
 DIST i2pd-0.5.0.tar.gz 352460 SHA256 7f2033fe1c380c458722d68f611d0fa69a844ceba71db13a918adac6e01a0594 SHA512 08c51dc5fa3712af54b7dcc9f4524fb19d7b42a279646c7852efdf1fd49cf4ea24192c936229954c3733ba4bcbc480205bcfeca739ffae3642f5c62bd24e0cf6 WHIRLPOOL 1812a8733f17cd6b9885cf8af3ad0412f238356121118d46fbed53cb826aaa6c878a045adb69e0a692fd5cd3fc720192c635f4e594d3d42efb2116f14bbba9e9
 EBUILD i2pd-0.5.0.ebuild 1845 SHA256 d359c5eae64a9421cb831938eee3d4d8a484cd872169b40c0b93bda40b7b2420 SHA512 f2844531b16a4be3609bda365326354d3ecae205434bffe4eaa2e5b4177f723e97be2ae1d222bb9a28d6e40c015dea09071bccc7b2a7faa9ceb23009b32b6cdb WHIRLPOOL e1d8c5c591479d80f5912a7d5bf0e17b1b0f0323260506862a03000d345aaded6bc9172e5cecdc24a9a3804316175a81665f1a18724431ca4c6074d7ae2a900f
 EBUILD i2pd-9999.ebuild 1875 SHA256 2e34270722cfb8501c282c89d14987a1857cc6adb70f50c884b988e5cbbe9fd3 SHA512 18877c292889d5d614fdd310a243e0e574fe98f124ac29411a716a634318b2a25770505635444994c6903d1303c1b24625463c860ed4c2afaf3cf085b25f7d38 WHIRLPOOL 283361622bfee68c94b832bae9c43d5e86f146fc6031c9620da6c55ebcc36a789bf0c3329f6cdd69abe418b56259f2f6eccf48dd8f8fb3463020ca71071b9ede
-MISC ChangeLog 733 SHA256 f72d5c8106689b1aaea2332d684a98f9730bd9668b4822a14848418d6e840fc5 SHA512 361bf47028e2015f3391258a4f5bd4799ba152c687210dce4594b04ad5de0360ce729f4c8762dc5b428dc60f917349b9271681e6c092d81ca2af30950eb20694 WHIRLPOOL c32c1d2b46051edb9fb735b4c1bd5d353ef948be81f66f7530aeb1ccfec367944d22b605002cda68a06d67d765ea108d00e6ae69f5010ca4d2877483f69e2f5f
+MISC ChangeLog 826 SHA256 fea9d4148cb6f733682874d81047b6a73e848b58670c579583a09aac69339c08 SHA512 682a7c498ab71757de62ebe5d1c93c1202c951d6b61f09ef231b1b24401b08c0ef016ab768913e2a7c113121880e45a85925c2ca86621bbe211757b8001df214 WHIRLPOOL 0012a627e3e33243ac2a98443dc969dab47cb7cdf29c4767069c9332a9790b41982507c1d10fee9e598ad30ed7bf0f4c566d8bbdfa6fa1ecdd56427378a47c74
 MISC metadata.xml 505 SHA256 94805fb4a94ff250fb81c585d9088f9575b6cef36b717bee72a566fe7a9d13aa SHA512 c4ff8b6c0535316934c77fd3c5249481a4c2a619a4f743b7f7784ff25e1b2839690239581c1d92b4176d4369c4f6a5a488f206c3ed6cc0433843e08b1f2c20f5 WHIRLPOOL 8231dfd31bdbc80c375f3efc8f190c10bd208c553e070ae3181bcf3d7e0760b540877a90f347080c43984c6a6a3815e91f5e211972058b444869b43b82c7e710
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUoeeDAAoJEKXBodJLEo5SkXIIAKaATADBSxye5hFi+GZXolph
-DrGl+0HrIfWkqyql486vm8culWpB+71YXS66Y8rZ7aTuG5WHIMcA6jvZciu6nu3O
-ScN++ByC6ZcZwY8wd1A1CBbgK/L2tmPw6nHWMg+bdBhRwfUj0fSkOoSrlmGmmZ8q
-3gXWAlCrQj91PvVcg5OjgSCMWdDeFg3Rudngt6VHLUj5hwcmyOa4+WRHclASk9Zg
-b0D7J6brJejIDQC+5QBr11iR0O7BEsgjcG2LxqAq2a7KosA7T9C80YkB29A7Dqx5
-N9JwvwWvQEoeJvHeDOhSCwWf/SaOb+8gZzLH7vUwuUjN4QB5XpuzVRNwBshb7c4=
-=59iN
+iQEcBAEBCAAGBQJUofDcAAoJEKXBodJLEo5SqDgH/iHPmtlx6wBCkE75GVvMV74h
+b9aNNCxQu5IabMQGfZNDyraDEN2dN1QTRfVxkWexu0QRwDAriavuwWd80r8iyu7O
+MrrFPz7lt+ghSV/qShANKI9raNgyguj1Sk7T5FafBYEwGBY5CZguQxexvwzhJOIa
+p7X/eu5RrJZhrwg/3CZxleJL+1qL5pGDIXeHsVsU1z202TuSLrwhO1oUteAwPU68
+mgoxkHkQ+jcjSH477HrkpY5PmqPj4th9iZVi4FtmBopmB1MIt5cUNpWtal0Drutr
+w1Os2hpUZLfBB5BIYxjrWTDx3FzyHHw1tE8AUENl8dHMmaGneUprZM8GkFMad0Y=
+=kLAB
 -----END PGP SIGNATURE-----
diff --git a/net-misc/i2pd/files/i2pd.initd b/net-misc/i2pd/files/i2pd.initd
index f9e2839..b69e4fa 100644
--- a/net-misc/i2pd/files/i2pd.initd
+++ b/net-misc/i2pd/files/i2pd.initd
@@ -5,20 +5,20 @@
 
 description="C++ daemon for accessing the I2P network"
 
-command="/usr/bin/i2pd"
-command_args="${I2PDOPTIONS}"
-pidfile="${I2PD_PID}"
-
 depend() {
 	use dns logger netmount
 }
 
-start_pre() {
-        touch "${I2PD_LOG}" "${I2PD_PID}"
-	chown "${I2PD_USER}:${I2PD_GROUP}" "${I2PD_LOG}" "${I2PD_PID}"
+start() {
+        ebegin "Starting ${SVCNAME}"
+	checkpath -f "${I2PD_LOG}" -o "${I2PD_USER}:${I2PD_GROUP}"
+	checkpath -f "${I2PD_PID}" -o "${I2PD_USER}:${I2PD_GROUP}"
+	start-stop-daemon -S -b -u "${I2PD_USER}:${I2PD_GROUP}" -1 "${I2PD_LOG}" /usr/bin/i2pd -- ${I2PDOPTIONS}
+        eend $?
 }
 
-
-stop_post() {
-	rm -f "${I2PD_PID}"
+stop() {
+        ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon -K -p "${I2PD_PID}"
+        eend $?
 }