Use --exec instead of --name in the initscript to make it compatible with baselayout-2.

Package-Manager: portage-2.1.2.2

3 files changed, 28 insertions, 15 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index 2a4a7eaebf14..9b507160ac8e 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.55 2007/03/24 18:43:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.56 2007/03/25 19:35:47 spock Exp $
+
+  25 Mar 2007; Michał Januszewski <spock@gentoo.org> files/hddtemp-init:
+  Use --exec instead of --name in the initscript to make it compatible with
+  baselayout-2.
 
   24 Mar 2007; nixnut <nixnut@gentoo.org> hddtemp-0.3_beta15-r1.ebuild:
   Stable on ppc wrt bug 171661
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index f0dd651b9f22..bc194c6df22f 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hddtemp-0.3_beta13-setsid.patch 370 RMD160 675fbd60d3a0b6dfdac14c94b852a6e587cb381e SHA1 ed4909b58930d9bd095cb0e2f451c72f0475d978 SHA256 5bf094e13c797eac602cdb2199b17a750ae74d3094fc01762455f5f59614ee1a
 MD5 91e4b7762278d6c80f97ce6039442e8d files/hddtemp-0.3_beta13-setsid.patch 370
 RMD160 675fbd60d3a0b6dfdac14c94b852a6e587cb381e files/hddtemp-0.3_beta13-setsid.patch 370
@@ -14,10 +17,10 @@ AUX hddtemp-conf.d 410 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 SHA1 3a64
 MD5 a4981932b07890d6292e068fb4ee8264 files/hddtemp-conf.d 410
 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 files/hddtemp-conf.d 410
 SHA256 4b7b6793edbe54669965bf49dac95b273f128481aabe4b2b9e6c263f0e0a9ff5 files/hddtemp-conf.d 410
-AUX hddtemp-init 553 RMD160 d8efb5bb429a4ac0f08978e06290e0196bc0a051 SHA1 07fec0aca7b2bfe85fbc9ab7724c47b9baac13ea SHA256 6c2161ff729274992d015bb382a6ec9d026020038729672fc4e219811597f82e
-MD5 e2379cc667cff85eab07a973df41901b files/hddtemp-init 553
-RMD160 d8efb5bb429a4ac0f08978e06290e0196bc0a051 files/hddtemp-init 553
-SHA256 6c2161ff729274992d015bb382a6ec9d026020038729672fc4e219811597f82e files/hddtemp-init 553
+AUX hddtemp-init 543 RMD160 0d29b8d7c4ec1bd2b854550eada31606788fce18 SHA1 6d462c570df1fc55803009346db9b34917717ac0 SHA256 ae3bf84fc92c403f29ca2524058befebf1af55dcd70f0e89db7ba7f72a2098eb
+MD5 7982c1f17ee05bdc00123791d64e2729 files/hddtemp-init 543
+RMD160 0d29b8d7c4ec1bd2b854550eada31606788fce18 files/hddtemp-init 543
+SHA256 ae3bf84fc92c403f29ca2524058befebf1af55dcd70f0e89db7ba7f72a2098eb files/hddtemp-init 543
 AUX hddtemp.db 20559 RMD160 ce148a09adfe2dde91c922f7a40cc71cdaf011f4 SHA1 f4ed19e51edfe5b5e8edffab7c650a0e6ce3ccb4 SHA256 8b19e70228214562eb10a46bd73b6ea8601e996f2d6527907b560d35b33f5240
 MD5 5321858f8c028d4b1a91a8a5f951f2f8 files/hddtemp.db 20559
 RMD160 ce148a09adfe2dde91c922f7a40cc71cdaf011f4 files/hddtemp.db 20559
@@ -36,10 +39,10 @@ EBUILD hddtemp-0.3_beta15.ebuild 1354 RMD160 7caa67dee0bba04a735a32cf48ab6d239ff
 MD5 731c6612dde81f724596d31aeabb12d7 hddtemp-0.3_beta15.ebuild 1354
 RMD160 7caa67dee0bba04a735a32cf48ab6d239ff5ca59 hddtemp-0.3_beta15.ebuild 1354
 SHA256 4a73f9306d42245a9bd7a69f69cc7cd98c0463b715e8d69cb9ee59afd1394425 hddtemp-0.3_beta15.ebuild 1354
-MISC ChangeLog 9359 RMD160 f3ff52e6a38f9f592fb3374108836dafe5050f3e SHA1 3e86f5a2806d94f0dc8f33e2fbad0bd38996b04a SHA256 6f2dc7c7b168d8ff5f7913788925689ffb52e04fb604962f8a7a41b32cc73840
-MD5 da7625932f78777a14ca2751cc1e9fbe ChangeLog 9359
-RMD160 f3ff52e6a38f9f592fb3374108836dafe5050f3e ChangeLog 9359
-SHA256 6f2dc7c7b168d8ff5f7913788925689ffb52e04fb604962f8a7a41b32cc73840 ChangeLog 9359
+MISC ChangeLog 9525 RMD160 33c98c9f367934c1e3b7958c08fd05d43401c64a SHA1 f2ba75a73b3e2e4cd7af13c7e7c63bdd265065c5 SHA256 1a68f8870b8a09044bf106d69814627e1a2bf143388af7f3a5fcf819191de161
+MD5 8f9c66e27a92c266f38b47b0a45d2ad0 ChangeLog 9525
+RMD160 33c98c9f367934c1e3b7958c08fd05d43401c64a ChangeLog 9525
+SHA256 1a68f8870b8a09044bf106d69814627e1a2bf143388af7f3a5fcf819191de161 ChangeLog 9525
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -53,3 +56,10 @@ SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/di
 MD5 f39545c75ab43d19430ab8abfe9ea3b9 files/digest-hddtemp-0.3_beta15-r1 259
 RMD160 0c7e37e16231df916c483eb49074bb7529f400ec files/digest-hddtemp-0.3_beta15-r1 259
 SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/digest-hddtemp-0.3_beta15-r1 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGBs8ichej4aZK9/cRAnJNAJ4vmY9ieTPxyiKNPbHDe9T0GvWZdgCfemQr
+yP2bs/rfV9HgnMxRxjswTgc=
+=lB7O
+-----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
index ef3674f22bf6..bbb11906ae3c 100644
--- a/app-admin/hddtemp/files/hddtemp-init
+++ b/app-admin/hddtemp/files/hddtemp-init
@@ -1,23 +1,22 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-init,v 1.3 2006/07/15 01:11:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/files/hddtemp-init,v 1.4 2007/03/25 19:35:47 spock Exp $
 
 depend() {
-	need localmount 
+	need localmount
 }
 
 start() {
 	ebegin "Starting hddtemp daemon"
-	/sbin/start-stop-daemon --start --quiet --name hddtemp  \
-	--exec ${HDDTEMP_EXEC} -- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
-
+	/sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
+	-- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping hddtemp daemon"
-	start-stop-daemon --stop --quiet --name hddtemp
+	start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
 	eend $?
 }