Fixed pidfile location in init script. Removed old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 3 insertions, 79 deletions

diff --git a/net-dns/pdnsd/files/pdnsd.online.1 b/net-dns/pdnsd/files/pdnsd.online.1
deleted file mode 100644
index 393ebf589ebd..000000000000
--- a/net-dns/pdnsd/files/pdnsd.online.1
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online.1,v 1.2 2011/03/28 14:00:21 polynomial-c Exp $
-
-depend() {
-	need pdnsd
-}
-
-wait_for_socket() {
-	local i=0 pdnsd_socket="/var/cache/pdnsd/pdnsd.status"
-	while [ $i -lt 10 ]; do
-		[ -S "${pdnsd_socket}" ] && return 0
-		i=$(($i+1))
-		sleep 1s
-	done
-
-    	return 1
-}
-
-start() {
-	wait_for_socket || return 1
-	ebegin "Starting pdnsd-online"
-	/usr/sbin/pdnsd-ctl -q server all up
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pdnsd-online"
-	/usr/sbin/pdnsd-ctl -q server all down
-	eend $?
-}
diff --git a/net-dns/pdnsd/files/pdnsd.rc6.1 b/net-dns/pdnsd/files/pdnsd.rc6.1
deleted file mode 100644
index b9dda2688391..000000000000
--- a/net-dns/pdnsd/files/pdnsd.rc6.1
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc6.1,v 1.2 2011/12/31 21:22:49 idl0r Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-	provide dns
-}
-
-checkconfig() {
-	if [ ! -e /etc/pdnsd/pdnsd.conf ] ; then
-		eerror "You need an /etc/pdnsd/pdnsd.conf file first."
-		eerror "There is a sample in /etc/pdnsd/pdnsd.conf.sample"
-		return 1
-	fi
-
-	if [ ! -d /var/cache/pdnsd ] ; then
-		mkdir /var/cache/pdnsd
-		chown pdnsd:pdnsd /var/cache/pdnsd
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting pdnsd"
-	start-stop-daemon --start --exec /usr/sbin/pdnsd \
-		-- -s -t -d -p /var/run/pdnsd.pid ${PDNSDCONFIG}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pdnsd"
-	start-stop-daemon --stop --pidfile /var/run/pdnsd.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading pdnsd.conf"
-	/usr/sbin/pdnsd-ctl config
-	eend $?
-}
diff --git a/net-dns/pdnsd/files/pdnsd.rc7 b/net-dns/pdnsd/files/pdnsd.rc7
index f6c91add617c..d41cc0f98024 100644
--- a/net-dns/pdnsd/files/pdnsd.rc7
+++ b/net-dns/pdnsd/files/pdnsd.rc7
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc7,v 1.3 2013/10/08 06:06:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.rc7,v 1.4 2014/02/07 14:48:46 polynomial-c Exp $
 
-pidfile="/var/run/pdnsd.pid"
+pidfile="/run/pdnsd.pid"
 command="/usr/sbin/pdnsd"
 command_args="-s -t -d -p ${pidfile} ${PDNSDCONFIG}"
 extra_started_commands="reload"