summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-03-01 09:47:30 +0000
committerRoy Marples <uberlord@gentoo.org>2006-03-01 09:47:30 +0000
commit43f971153843ac3e5d15bcb5858cc95367c042d5 (patch)
treeb65b02a4fcd2f29bb68a6835573c1afd0bf8e17b /net-misc/dhcp
parentVersion bump. (diff)
downloadgentoo-2-43f971153843ac3e5d15bcb5858cc95367c042d5.tar.gz
gentoo-2-43f971153843ac3e5d15bcb5858cc95367c042d5.tar.bz2
gentoo-2-43f971153843ac3e5d15bcb5858cc95367c042d5.zip
Prefer SVCNAME over myservice
(Portage version: 2.1_pre5-r1)
Diffstat (limited to 'net-misc/dhcp')
-rw-r--r--net-misc/dhcp/files/dhcpd.init6
1 files changed, 3 insertions, 3 deletions
diff --git a/net-misc/dhcp/files/dhcpd.init b/net-misc/dhcp/files/dhcpd.init
index aed1d1e14177..61b83a43c32f 100644
--- a/net-misc/dhcp/files/dhcpd.init
+++ b/net-misc/dhcp/files/dhcpd.init
@@ -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/net-misc/dhcp/files/dhcpd.init,v 1.1 2006/02/28 10:38:58 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.2 2006/03/01 09:47:30 uberlord Exp $
DHCPD_CONF="/etc/dhcp/dhcpd.conf"
@@ -50,7 +50,7 @@ start() {
local pidfile="$(get_var pid-file-name)"
pidfile="${pidfile:-/var/run/dhcp/dhcpd.pid}"
- ebegin "Starting ${DHCPD_CHROOT:+chrooted }${myservice}"
+ ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
start-stop-daemon --start --exec /usr/sbin/dhcpd \
--pidfile "${DHCPD_CHROOT}/${pidfile}" \
-- ${DHCPD_OPTS} -q -pf "${pidfile}" -cf "${DHCPD_CONF}" \
@@ -64,7 +64,7 @@ start() {
stop() {
local chrooted=""
[[ -n $(get_options chroot) ]] && chrooted="chrooted "
- ebegin "Stopping ${chrooted}${myservice}"
+ ebegin "Stopping ${chrooted}${SVCNAME}"
start-stop-daemon --stop --exec /usr/sbin/dhcpd \
--pidfile "$(get_options pidfile)"
eend $?