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
commit63a0a6e16f08d527b293d6363465ff1d1ae69eae (patch)
tree4e521d27ab5c62aeeb36dfac8c1d88a19aa27293 /net-misc
parentVersion bump. (diff)
downloadhistorical-63a0a6e16f08d527b293d6363465ff1d1ae69eae.tar.gz
historical-63a0a6e16f08d527b293d6363465ff1d1ae69eae.tar.bz2
historical-63a0a6e16f08d527b293d6363465ff1d1ae69eae.zip
Prefer SVCNAME over myservice
Package-Manager: portage-2.1_pre5-r1
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/dhcp/Manifest12
-rw-r--r--net-misc/dhcp/files/dhcpd.init6
2 files changed, 9 insertions, 9 deletions
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 0bd18886aca7..0f45a6058bf8 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -52,9 +52,9 @@ SHA256 fb142b26646c3b0ffb95001e437658da1caaf82e263b341c3e75a61cb2a6cf57 files/dh
MD5 431ad519efb9e00ce6218a3c0962185d files/dhcpd.conf 1093
RMD160 31e99b1fcc2759c3f86863f549d8ddd974b06d30 files/dhcpd.conf 1093
SHA256 0f0c2a46bd649cdd4214c2503b6d2b7318a61ac129d6060011232390afdd31b1 files/dhcpd.conf 1093
-MD5 802baaa3c8033d377e79042cc837da84 files/dhcpd.init 2092
-RMD160 9be372f898a088d2fdfdbb0a6d3c674e2bdd99c8 files/dhcpd.init 2092
-SHA256 d25aa2001631e49043c7f7096165dfb1631a24da19dd38c01f419f32e69a705c files/dhcpd.init 2092
+MD5 73765d0dd023f76829eaa670e6172362 files/dhcpd.init 2088
+RMD160 2a59bbb044790674d9573652ee369d4854d8b759 files/dhcpd.init 2088
+SHA256 5a511a31d0109b7a0eac6d4013eb46452ea9e773064f44e6de1587ace9d2e525 files/dhcpd.init 2088
MD5 7d49ecbe9f433f8c00d1fafe087abb9b files/dhcrelay.conf 408
RMD160 943d64b87699f4c0aa498a425b692fc84af882ea files/dhcrelay.conf 408
SHA256 78cf04d4e32f937bfc658a11492811a0570499481ffc12f2ffb78dc69ca9fad4 files/dhcrelay.conf 408
@@ -79,7 +79,7 @@ SHA256 456ab9c26235fa4c1eda6b53b163e901869d5f64ba442b30db1fe86c57fe56af metadata
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (GNU/Linux)
-iD8DBQFEBChQEbVyYKaZ/NERApV+AJ96ExGvF+E9Ce0QGpFHL848966BpgCghEOK
-pOvuKb8fDi/BTsYQn/lfJrE=
-=rBca
+iD8DBQFEBW2/EbVyYKaZ/NERAjQrAKCCq5ovtKTtFUerk9TzuZdtHFfdZgCfXJ7t
+v6to9kyxtkFaoEznHo0EG+I=
+=FncI
-----END PGP SIGNATURE-----
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 $?