Make i8kmon init script really work, fixes #110572

Package-Manager: portage-2.1.1-r1

4 files changed, 32 insertions, 16 deletions

diff --git a/app-laptop/i8kutils/ChangeLog b/app-laptop/i8kutils/ChangeLog
index ede538b74a89..f59a0b64978a 100644
--- a/app-laptop/i8kutils/ChangeLog
+++ b/app-laptop/i8kutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-laptop/i8kutils
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/ChangeLog,v 1.13 2006/08/10 13:29:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/i8kutils/ChangeLog,v 1.14 2006/10/02 01:06:09 tester Exp $
+
+  02 Oct 2006; Olivier Crête <tester@gentoo.org> files/i8k.init:
+  Make i8kmon init script really work, fixes #110572
 
   09 Aug 2006; Doug Goldstein <cardoe@gentoo.org> i8kutils-1.25.ebuild:
   USE flag split tcltk->tcl & tk per bug #17808
diff --git a/app-laptop/i8kutils/Manifest b/app-laptop/i8kutils/Manifest
index 9ae92c1b41f9..dbf0f25a026f 100644
--- a/app-laptop/i8kutils/Manifest
+++ b/app-laptop/i8kutils/Manifest
@@ -1,24 +1,34 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX i8k.conf 891 RMD160 0331ff37c0c083315d91e459247399c096adc695 SHA1 b532f1ab9719bd0a6cdfb03cacbce1b478001f93 SHA256 7e867dd900bcf393326d350017b29980452b38a30a1cd4581b786091b4571bca
 MD5 d4d358aea65a5d6fd19f4abb17c043d4 files/i8k.conf 891
 RMD160 0331ff37c0c083315d91e459247399c096adc695 files/i8k.conf 891
 SHA256 7e867dd900bcf393326d350017b29980452b38a30a1cd4581b786091b4571bca files/i8k.conf 891
-AUX i8k.init 1165 RMD160 795ad1f922565a4c43a995134255d7a5ac59d00a SHA1 a70b195075427357656e93a0a7f1817f6022a174 SHA256 0801185ae3140aefc0bbf347d32612c486e882ab9673b7b1cd59204c19e31854
-MD5 1dae8e3aae85f468d86aaddf072bb559 files/i8k.init 1165
-RMD160 795ad1f922565a4c43a995134255d7a5ac59d00a files/i8k.init 1165
-SHA256 0801185ae3140aefc0bbf347d32612c486e882ab9673b7b1cd59204c19e31854 files/i8k.init 1165
-DIST i8kutils_1.25.tar.gz 40528
+AUX i8k.init 1161 RMD160 b7bb1c1a4d1bddd562df09cdac64c4c427dda419 SHA1 8a0d094264b6e63ec6bf26b8636f8875da22ea4b SHA256 67c4114d6f6ac5cf8c4bfb10a65e523ef54119b58b61f44dcd893eb2c5cc2153
+MD5 26dc58c65f6a29452d4792d5ec2d3b0a files/i8k.init 1161
+RMD160 b7bb1c1a4d1bddd562df09cdac64c4c427dda419 files/i8k.init 1161
+SHA256 67c4114d6f6ac5cf8c4bfb10a65e523ef54119b58b61f44dcd893eb2c5cc2153 files/i8k.init 1161
+DIST i8kutils_1.25.tar.gz 40528 RMD160 45a45afb2c5528b30864226a5f29c3af2824107f SHA1 f75b117e67242ded9b2936add0e947b6b6dbd976 SHA256 30bd138f31e3632e35472c012732a74c7dac5a87708fd7b24f323a0ca7c71ca4
 EBUILD i8kutils-1.25.ebuild 1099 RMD160 ea3feda5a232869d00977b0f6a5ad057d96cc2fb SHA1 bada0894522bad16c02a6195a63bc8cdda883acc SHA256 1b604c24ee8961b67b3f7fc0f63c08f01fd40eb67b668502bac57b580330f5db
 MD5 45ee74ddd81e0ab184e5709ffc82634f i8kutils-1.25.ebuild 1099
 RMD160 ea3feda5a232869d00977b0f6a5ad057d96cc2fb i8kutils-1.25.ebuild 1099
 SHA256 1b604c24ee8961b67b3f7fc0f63c08f01fd40eb67b668502bac57b580330f5db i8kutils-1.25.ebuild 1099
-MISC ChangeLog 2029 RMD160 adcf4a2e935c9a4f1a71d51b9d8f797accc10e78 SHA1 87f64ac17da6e74dea943e120ce60a684e68f32d SHA256 7cbd24ca1561a0973e6eb78a8d37b4129c723b307a94266afa1707228928a1f0
-MD5 9d30f1aa599fc51eea7b1d5aeb543eb9 ChangeLog 2029
-RMD160 adcf4a2e935c9a4f1a71d51b9d8f797accc10e78 ChangeLog 2029
-SHA256 7cbd24ca1561a0973e6eb78a8d37b4129c723b307a94266afa1707228928a1f0 ChangeLog 2029
+MISC ChangeLog 2149 RMD160 175c16a8febe75de9b12e35f30b764fec28c74a0 SHA1 fc307fc65e956738707b8c2edf8c2c0b7411421e SHA256 badb455ec4470a787e12cbe63af549f292ea190a369b758543f4b1e7770137c7
+MD5 c53e22eb5237afa6d124537c8458fdf1 ChangeLog 2149
+RMD160 175c16a8febe75de9b12e35f30b764fec28c74a0 ChangeLog 2149
+SHA256 badb455ec4470a787e12cbe63af549f292ea190a369b758543f4b1e7770137c7 ChangeLog 2149
 MISC metadata.xml 252 RMD160 aba86675c8302b99a004a7ce6e90d87b784b9550 SHA1 bceef7552c6b70b8e0577919a936c32f49e88800 SHA256 716694080dffa94651b7f560af1d59b85f9a42430b85cfc9152e4352f8de8f10
 MD5 8ad10de4d8833ae2a73147d6e65c199c metadata.xml 252
 RMD160 aba86675c8302b99a004a7ce6e90d87b784b9550 metadata.xml 252
 SHA256 716694080dffa94651b7f560af1d59b85f9a42430b85cfc9152e4352f8de8f10 metadata.xml 252
-MD5 3b93250488155c8ff80461d5f4f1d220 files/digest-i8kutils-1.25 64
-RMD160 8f7a293262ceab2a1dd64de4dc9551b63d8581fb files/digest-i8kutils-1.25 64
-SHA256 f4d936cf9c69aeaa3685d5df57de3ff855e0599aa9597b161070625e3c3f11ef files/digest-i8kutils-1.25 64
+MD5 cc1182161c74011543056076ebb3ef5f files/digest-i8kutils-1.25 238
+RMD160 f0775cfd3ba9fe262d855fb32bca29ee12b7ada2 files/digest-i8kutils-1.25 238
+SHA256 f03eb91756b71f9d9af8cb5ace70cff25be32349a66c510b1d550527d263097a files/digest-i8kutils-1.25 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFIGbjmOfEJZHYOKcRAlzaAJ9c75UsfHkbMQRgOl6GBmLLSjpvHQCeNwEI
+J7Z0IiQHWL4SAu586Uvnt6Y=
+=YiIe
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/i8kutils/files/digest-i8kutils-1.25 b/app-laptop/i8kutils/files/digest-i8kutils-1.25
index 47d2ba6514c9..299ec6385556 100644
--- a/app-laptop/i8kutils/files/digest-i8kutils-1.25
+++ b/app-laptop/i8kutils/files/digest-i8kutils-1.25
@@ -1 +1,3 @@
 MD5 50c03dde689c5709406118a7c6c120db i8kutils_1.25.tar.gz 40528
+RMD160 45a45afb2c5528b30864226a5f29c3af2824107f i8kutils_1.25.tar.gz 40528
+SHA256 30bd138f31e3632e35472c012732a74c7dac5a87708fd7b24f323a0ca7c71ca4 i8kutils_1.25.tar.gz 40528
diff --git a/app-laptop/i8kutils/files/i8k.init b/app-laptop/i8kutils/files/i8k.init
index 92b2d991589b..98003962ff77 100644
--- a/app-laptop/i8kutils/files/i8k.init
+++ b/app-laptop/i8kutils/files/i8k.init
@@ -26,8 +26,9 @@ start() {
 	fi
 	if [ ! -n "$NOMON" ]; then
 		ebegin "Starting i8kmon"
-		start-stop-daemon --start --quiet --pidfile /var/run/i8kmon.pid \
-			--make-pidfile --exec /usr/bin/i8kmon --background \
+		start-stop-daemon --start -b --quiet  \
+			--exec /usr/bin/i8kmon --background \
+			--name "tclsh /usr/bin/i8kmon" \
 			-- -d ${NOAUTO:+-na} ${TIMEOUT:+-t $TIMEOUT}
 		eend $?
 	fi
@@ -41,7 +42,7 @@ stop() {
 	fi
 	if [ ! -n "$NOMON" ]; then
 		ebegin "Stopping i8kmon"
-		start-stop-daemon --stop --quiet --pidfile /var/run/i8kmon.pid
+		start-stop-daemon --stop --quiet --name "tclsh /usr/bin/i8kmon"
 		eend $?
 	fi
 }