summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2008-12-13 10:50:00 +0000
committerAlin Năstac <mrness@gentoo.org>2008-12-13 10:50:00 +0000
commitd9cfe8996acd9a4e3020ee1bc7d1e6ab95c1a773 (patch)
tree97ffe7f7fd925c9c896eabb984a7155af5e619e9 /net-dns
parentversion bump (diff)
downloadgentoo-2-d9cfe8996acd9a4e3020ee1bc7d1e6ab95c1a773.tar.gz
gentoo-2-d9cfe8996acd9a4e3020ee1bc7d1e6ab95c1a773.tar.bz2
gentoo-2-d9cfe8996acd9a4e3020ee1bc7d1e6ab95c1a773.zip
Solve startup error of the pdnsd-online service (#249981).
(Portage version: 2.1.4.5, RepoMan options: --force)
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/pdnsd/ChangeLog8
-rw-r--r--net-dns/pdnsd/files/pdnsd.online17
-rw-r--r--net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild (renamed from net-dns/pdnsd/pdnsd-1.2.7.ebuild)2
3 files changed, 22 insertions, 5 deletions
diff --git a/net-dns/pdnsd/ChangeLog b/net-dns/pdnsd/ChangeLog
index b328c672ba6b..b69b723d9efc 100644
--- a/net-dns/pdnsd/ChangeLog
+++ b/net-dns/pdnsd/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-dns/pdnsd
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.88 2008/09/19 18:41:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/ChangeLog,v 1.89 2008/12/13 10:49:59 mrness Exp $
+
+*pdnsd-1.2.7-r1 (13 Dec 2008)
+
+ 13 Dec 2008; Alin Năstac <mrness@gentoo.org> files/pdnsd.online,
+ -pdnsd-1.2.7.ebuild, +pdnsd-1.2.7-r1.ebuild:
+ Solve startup error of the pdnsd-online service (#249981).
19 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org> pdnsd-1.2.7.ebuild:
ppc stable, bug #231285
diff --git a/net-dns/pdnsd/files/pdnsd.online b/net-dns/pdnsd/files/pdnsd.online
index b7bef321221a..8db7f6f25690 100644
--- a/net-dns/pdnsd/files/pdnsd.online
+++ b/net-dns/pdnsd/files/pdnsd.online
@@ -1,20 +1,31 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online,v 1.4 2004/07/14 23:26:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/files/pdnsd.online,v 1.5 2008/12/13 10:50:00 mrness Exp $
depend() {
need pdnsd net.${IFACE}
}
+wait_for_socket() {
+ local pdnsd_socket="/var/cache/pdnsd/pdnsd.status"
+ for ((i=0; i < 10; i=$i+1)) ; do
+ [ -S "${pdnsd_socket}" ] && return 0
+ sleep 1s
+ done
+ eerror "${pdnsd_socket} socket is missing."
+ return 1
+}
+
start() {
+ wait_for_socket || return 1
ebegin "Starting pdnsd-online"
- /usr/sbin/pdnsd-ctl server all up
+ /usr/sbin/pdnsd-ctl -q server all up
eend $?
}
stop() {
ebegin "Stopping pdnsd-online"
- /usr/sbin/pdnsd-ctl server all down
+ /usr/sbin/pdnsd-ctl -q server all down
eend $?
}
diff --git a/net-dns/pdnsd/pdnsd-1.2.7.ebuild b/net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild
index 469aafd2ed53..e8f60cde2735 100644
--- a/net-dns/pdnsd/pdnsd-1.2.7.ebuild
+++ b/net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.7.ebuild,v 1.5 2008/09/19 18:41:54 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdnsd/pdnsd-1.2.7-r1.ebuild,v 1.1 2008/12/13 10:49:59 mrness Exp $
inherit eutils