From f33608b1fea89fefe1f12928439342fec9a29374 Mon Sep 17 00:00:00 2001 From: Tom William Payne Date: Thu, 16 Nov 2006 12:27:44 +0000 Subject: [PATCH] Don't use --env switch in init script. Package-Manager: portage-2.1.2_rc1-r6 --- media-sound/slimserver/ChangeLog | 5 ++++- media-sound/slimserver/Manifest | 16 ++++++++-------- media-sound/slimserver/files/slimserver.init.d | 5 ++--- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/media-sound/slimserver/ChangeLog b/media-sound/slimserver/ChangeLog index e6ebafc3c552..14bec8fd28e6 100644 --- a/media-sound/slimserver/ChangeLog +++ b/media-sound/slimserver/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-sound/slimserver # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/slimserver/ChangeLog,v 1.1 2006/11/13 19:41:57 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/slimserver/ChangeLog,v 1.2 2006/11/16 12:27:44 twp Exp $ + + 16 Nov 2006; files/slimserver.init.d: + Don't use --env switch in init script. *slimserver-6.5.0 (13 Nov 2006) diff --git a/media-sound/slimserver/Manifest b/media-sound/slimserver/Manifest index 0e928d7f5d28..8f34d23c447f 100644 --- a/media-sound/slimserver/Manifest +++ b/media-sound/slimserver/Manifest @@ -10,19 +10,19 @@ AUX slimserver.conf.d 113 RMD160 5a4e59ef0ce7f6f0bff1c02b1a1f5deb7ac89d0f SHA1 5 MD5 ad43cb28f5228456221c94c86cabae9c files/slimserver.conf.d 113 RMD160 5a4e59ef0ce7f6f0bff1c02b1a1f5deb7ac89d0f files/slimserver.conf.d 113 SHA256 2949502a8242dbadf7d235a127fa8a2984e6c04d1501b3e7d49ac34914cdeb16 files/slimserver.conf.d 113 -AUX slimserver.init.d 1146 RMD160 d663dd0a623d444603e60f80d567a975f62a63b8 SHA1 4c14a084ed1bd4b4ae4cbdc623ca10972417e8fd SHA256 96f9e10f400b2178ecf2e53dc15c3901a46f0bc8f499c3b7bd2ccec20574720c -MD5 7c987e5936c680212a07aacd15787831 files/slimserver.init.d 1146 -RMD160 d663dd0a623d444603e60f80d567a975f62a63b8 files/slimserver.init.d 1146 -SHA256 96f9e10f400b2178ecf2e53dc15c3901a46f0bc8f499c3b7bd2ccec20574720c files/slimserver.init.d 1146 +AUX slimserver.init.d 1136 RMD160 e85f8142ed6dcb60c0027e2a660baab7531c80fc SHA1 632f55cdd64b0f2f43e008217d63257b19828491 SHA256 97b087a0bf4b52e674c1a97de2645d1f8c059efa2cdecaef8517c7e309a68d3f +MD5 9e34a15c2f3ebf6fad8f81267d13ad3c files/slimserver.init.d 1136 +RMD160 e85f8142ed6dcb60c0027e2a660baab7531c80fc files/slimserver.init.d 1136 +SHA256 97b087a0bf4b52e674c1a97de2645d1f8c059efa2cdecaef8517c7e309a68d3f files/slimserver.init.d 1136 DIST SlimServer_v6.5.0.no-cpan-arch.tar.gz 12320425 RMD160 eb45f03d9f07ad50a56f3ad2d1fa021ae2a86c93 SHA1 af29c105f540e6187e707f45cd07f5df878f9b1c SHA256 63bd2600efd70c4165b474dfab97e32085af80b155e99f944bbcc6937ed68ead EBUILD slimserver-6.5.0.ebuild 3861 RMD160 1e149c543d662bbdd03171bc68ae0daa56504e12 SHA1 04621cb6cd472685ebe88ff3ad2fc96fd2e134cd SHA256 46a2684f0068f6f6926b0c781e4100bc57500a191e455bac26a62a3cbfa64112 MD5 e848045a22a752d3570133767b1fb4de slimserver-6.5.0.ebuild 3861 RMD160 1e149c543d662bbdd03171bc68ae0daa56504e12 slimserver-6.5.0.ebuild 3861 SHA256 46a2684f0068f6f6926b0c781e4100bc57500a191e455bac26a62a3cbfa64112 slimserver-6.5.0.ebuild 3861 -MISC ChangeLog 501 RMD160 13300ae770323f7627b8d2681a16f36d79490e62 SHA1 d0d41af866db49a88141be0c4cbb655c22b108f5 SHA256 7e0e78a3288dff0ce8899d6362407c77b04eff9ede64ab779fa1745d1754dfbf -MD5 a48082c34983578cb88dd06213bac190 ChangeLog 501 -RMD160 13300ae770323f7627b8d2681a16f36d79490e62 ChangeLog 501 -SHA256 7e0e78a3288dff0ce8899d6362407c77b04eff9ede64ab779fa1745d1754dfbf ChangeLog 501 +MISC ChangeLog 600 RMD160 54bf8bb8d4d19cae59bbab3a203f65bf13da14be SHA1 c2768f7ec0e316353582a60a09cdbc13d48222eb SHA256 8a83be4c0a8a36dd2311f9a1c5e77ea45d8e927d82f9c75db973774abde8d54a +MD5 04060329d377e79c5c4e262487099be2 ChangeLog 600 +RMD160 54bf8bb8d4d19cae59bbab3a203f65bf13da14be ChangeLog 600 +SHA256 8a83be4c0a8a36dd2311f9a1c5e77ea45d8e927d82f9c75db973774abde8d54a ChangeLog 600 MISC metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d SHA1 bee870f83b6bd74feedef2b9ff8da8f4820cc19f SHA256 c7b6d3457d4746a2b281c4ac598bcf78b8e1553d8d63f2523b4cd0f4eaa422b1 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244 RMD160 10fcb6c60f0d88174ff99fd391d0da3a75bdf89d metadata.xml 244 diff --git a/media-sound/slimserver/files/slimserver.init.d b/media-sound/slimserver/files/slimserver.init.d index 0b6c474cab7c..d5a0245b5b73 100644 --- a/media-sound/slimserver/files/slimserver.init.d +++ b/media-sound/slimserver/files/slimserver.init.d @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/slimserver/files/slimserver.init.d,v 1.1 2006/11/13 19:41:57 twp Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/slimserver/files/slimserver.init.d,v 1.2 2006/11/16 12:27:44 twp Exp $ SLIMSERVER_PIDFILE="/var/run/slimserver/slimserver.pid" @@ -17,8 +17,7 @@ start() { [[ -n "${SLIMSERVER_PLAYLISTDIR}" ]] \ && myopts="${myopts} --playlistdir ${SLIMSERVER_PLAYLISTDIR}" ebegin "Starting slimserver" - start-stop-daemon --start \ - --env HOME=/opt/slimserver \ + HOME=/opt/slimserver start-stop-daemon --start \ --exec /opt/slimserver/slimserver.pl \ --pidfile ${SLIMSERVER_PIDFILE} \ -- \ -- 2.26.2