From: Daniel Black Date: Sat, 20 Nov 2004 01:17:10 +0000 (+0000) Subject: more init script fixes as per bug #71674. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c545a80cf079efd2dc32e9da78d9af7991e22fcc;p=gentoo.git more init script fixes as per bug #71674. --- diff --git a/www-proxy/wwwoffle/ChangeLog b/www-proxy/wwwoffle/ChangeLog index 5effd6a9be1a..b64a6306ac5c 100644 --- a/www-proxy/wwwoffle/ChangeLog +++ b/www-proxy/wwwoffle/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for www-proxy/wwwoffle # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/ChangeLog,v 1.6 2004/11/19 10:10:01 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/ChangeLog,v 1.7 2004/11/20 01:17:10 dragonheart Exp $ + + 20 Nov 2004; Daniel Black files/wwwoffle-2.8c-init, + files/wwwoffle-2.8c-init-online: + more init script fixes as per bug #71674. Thanks again to BlaisorBlade + 19 Nov 2004; Daniel Black files/wwwoffle-2.8c-init-online: diff --git a/www-proxy/wwwoffle/Manifest b/www-proxy/wwwoffle/Manifest index 99d4ca3c1279..f6288ead0bcb 100644 --- a/www-proxy/wwwoffle/Manifest +++ b/www-proxy/wwwoffle/Manifest @@ -1,7 +1,7 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 bbb4d71b71573896305e44b9942ef946 ChangeLog 5457 +MD5 5226fdc22bbc42399b89b18599cf572d ChangeLog 5676 MD5 1d58b504a9415220f2ee8c3b62e27aa9 metadata.xml 500 MD5 07fd41412527be803f47bc33f655d04a wwwoffle-2.7h.ebuild 1851 MD5 f22ae7381da1e4ad894c3cfd1f0d6cb9 wwwoffle-2.8b.ebuild 4534 @@ -11,14 +11,14 @@ MD5 009de7420924ad30ca9611df2d1d6299 files/digest-wwwoffle-2.8b 62 MD5 6cf4ab4a8f2db9c8e503aac035d38eae files/wwwoffled 506 MD5 ecf6ff07d66bdc91ff7ff6014ab5c016 files/wwwoffled-online 510 MD5 a426ce505020deefa18627d26d04eed0 files/wwwoffled-online-2.8b 524 -MD5 4fbc4cbe0a91616eb571e970c95d79d6 files/wwwoffle-2.8c-init 543 +MD5 9927058cfa49a5ff4211562fd9b45ba9 files/wwwoffle-2.8c-init 548 MD5 15326883b6b630a44a6ff486b78f0724 files/wwwoffle-2.8c-config-online 437 MD5 09bad363445f5ae84603fcb283b17003 files/digest-wwwoffle-2.8c 62 -MD5 b5c93a728ed7e90f79c05cfcfa1082a3 files/wwwoffle-2.8c-init-online 695 +MD5 41257f96933dce71afd7396c1e0cc4e6 files/wwwoffle-2.8c-init-online 705 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBncaAmdTrptrqvGERAmP/AJ40E7a3MJ6oaUBunQd35PeGZZ08wwCeM8sR -TN82Ly4YuaZIwUoArJr5JJ4= -=VhhE +iD8DBQFBnpsdmdTrptrqvGERAi+TAJ9tJgBX/44ZK92XWsUS3z4Y4zRwUACght+d +CyjbRNEzlz1I+fJlLqpeAyY= +=QiDC -----END PGP SIGNATURE----- diff --git a/www-proxy/wwwoffle/files/wwwoffle-2.8c-init b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init index 0a5d27941fba..eac46bf6d73c 100644 --- a/www-proxy/wwwoffle/files/wwwoffle-2.8c-init +++ b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/files/wwwoffle-2.8c-init,v 1.1 2004/09/19 07:18:43 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/files/wwwoffle-2.8c-init,v 1.2 2004/11/20 01:17:10 dragonheart Exp $ depend() { need localmount @@ -10,7 +10,7 @@ depend() { start() { ebegin "Starting wwwoffled" start-stop-daemon --start --quiet --exec /usr/sbin/wwwoffled \ - -u wwwoffle -- -c /etc/wwwoffle/wwwoffle.conf + -u wwwoffle -- -c /etc/wwwoffle/wwwoffle.conf 2>&1 eend $? } diff --git a/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online index 2eaa6eba3749..8aacd5798c1c 100644 --- a/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online +++ b/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online @@ -1,10 +1,11 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online,v 1.2 2004/11/19 10:10:01 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-proxy/wwwoffle/files/wwwoffle-2.8c-init-online,v 1.3 2004/11/20 01:17:10 dragonheart Exp $ depend() { - need wwwoffled dns + need wwwoffled + use dns if [ -n ${IFACE} ]; then @@ -18,7 +19,7 @@ depend() { start() { ebegin "Starting wwwoffled-online" wwwoffle -online -c /etc/wwwoffle/wwwoffle.conf - wwwoffle -fetch -c /etc/wwwoffle/wwwoffle.conf & > /dev/null + wwwoffle -fetch -c /etc/wwwoffle/wwwoffle.conf & > /dev/null 2>&1 eend $? }