net-misc/dhcp: correct same small bugs
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@1352 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
6a9cb88d98
commit
48b443a01c
@ -2,6 +2,10 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.154 2009/05/29 23:30:28 vapier Exp $
|
||||
|
||||
08 Jul 2009; Mario Fetka <mario.fetka@gmail.com> dhcp-3.1.2.ebuild,
|
||||
dhcp-4.0.1.ebuild, dhcp-4.1.0.ebuild, files/dhcpd.init:
|
||||
correct same small bugs
|
||||
|
||||
*dhcp-4.1.0 (08 Jul 2009)
|
||||
|
||||
08 Jul 2009; Mario Fetka <mario.fetka@gmail.com> +dhcp-4.1.0.ebuild,
|
||||
|
||||
@ -26,7 +26,7 @@ AUX dhcp-4.0.1.ebuild.patch 2594 RMD160 2a07162a5a9b9c3373d409a9bf0a05e9ae97d23f
|
||||
AUX dhcp-4.1-dhclient-metric.patch 8332 RMD160 9ac1d0588d911700e4f86a10275010bb60f98b42 SHA1 a27db920020de86c42c54d073cf34ba0f8d17af8 SHA256 93b7072aa10868755db60cbcc631017a516cfa617345eaa1f2774791c9e4c3ab
|
||||
AUX dhcp-4.1-no_isc_blurb.patch 2711 RMD160 72de8521fcb1c5876770d8fda8a5e88f6199d58d SHA1 a27b11f0e1bb1cbc41b4676a3ff2fa6c0a6c113c SHA256 d8e96e99c2ca68aab5f4194fac6b7d3dcb35adf1a697a4696b06ee950759bf2f
|
||||
AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
|
||||
AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
|
||||
AUX dhcpd.init 2502 RMD160 145e70595121d83596e5eea07b0397023ee37b7f SHA1 27289d207b933619a70f811ae25b10045433e4ca SHA256 6be02f3e948762760a8c83acbffe6f77fd3463acd8bed1194e96234e6897fbea
|
||||
AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
|
||||
AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
|
||||
DIST dhcp-3.1.2.tar.gz 799626 RMD160 026ac48b176ec273397fafa8a834a21fd6331681 SHA1 a60cccec2402a35025ddaafc8ac896595188560e SHA256 80daba1e4ac220a0945778aa3c1c9eb7860c4426645660bebb8ed35a3231a2fb
|
||||
@ -35,8 +35,8 @@ DIST dhcp-4.1.0.tar.gz 1086815 RMD160 bf96fa9d135a65b4d9b27f8caf4f3744f0636c80 S
|
||||
DIST ldap-for-dhcp-3.1.2-2.tar.gz 39752 RMD160 96d2f469b1349485c0202012697222911b81abe8 SHA1 023d12eeb148ad493e252edbfd112d19c9d0cecd SHA256 afd30a30d72a17a4d8ae1a27c247711f03b30b5e270bdcf9f521695b55b28db7
|
||||
DIST ldap-for-dhcp-4.0.1-3.tar.gz 39117 RMD160 977ec08ec0213e1a53d0dd5b3b08a234172dbd22 SHA1 8bc692bb2017c1b5ff35d73c10e5a2e4ed44e559 SHA256 161f5cd479ba0789d139ef59d101244fa7c880c3d1c13cbbbbae978004a30a18
|
||||
DIST ldap-for-dhcp-4.1.0-4.tar.gz 39175 RMD160 a9e31099bb971bdba0e78b80130f539ccc5eed0b SHA1 1c37ebf531b6a0bc358edc6f3e31b57bfe88dd8e SHA256 1088f0c0b2c7d8cc543eb0d34e655690a6efaec7eca85df3e28c06a2c456780b
|
||||
EBUILD dhcp-3.1.2.ebuild 8439 RMD160 af0143fd42720fc2ff28d72453023606a0be0964 SHA1 145459d45b160cb33b26165627e10e2ef1f73b7d SHA256 1ce562b1585743391b671e808d30a7572cd17ad0a8c6f20371fe07ed14b4bdb1
|
||||
EBUILD dhcp-4.0.1.ebuild 7591 RMD160 e040ba3ab002c67f8a09be6b05eca762c602bad8 SHA1 848ca4332e76e68e253faff09cb8bbcde759369a SHA256 135a13f083d48eb6cb28ce859ce026a97141e6f0920767a0ef2dedf22c7e8391
|
||||
EBUILD dhcp-4.1.0.ebuild 7519 RMD160 44fa11c14648e88fee7f72826d0c2ccadebf81ed SHA1 160928f21736c78a861d9c17e37e87d167f8e33e SHA256 6dbf3bdab27e1fc39def686b7f20de92393bf512e2ca7019ccca5c7fa18e3bea
|
||||
MISC ChangeLog 28436 RMD160 fc01452f151469fdcde75faa1faf9ccbd964a92e SHA1 6b4d601c11c15ead0218602d3b2c4390e53fa958 SHA256 70f957b4d234bdd177696bd766ece96e851c8f0676a653aa8b01d1c7d1a25a25
|
||||
EBUILD dhcp-3.1.2.ebuild 8466 RMD160 3a49e7318d635a5ef940d2765832cfa133fe77d3 SHA1 9895117cd684d340ef9cdf8a7a924b77ffcfdb64 SHA256 5b2a6adc4c5ba199ba4bf57b2edf98b6788396c5c99587d0607cd4cccb28ca10
|
||||
EBUILD dhcp-4.0.1.ebuild 7618 RMD160 004c49cda2fe8bc65f715748fe6b91d6ef27d9ef SHA1 5119917732b3c9be442085cc757914bb2b7b5f42 SHA256 d44301b743ecfa8edd846bc8ceba53571063c6293dcd188552bc912d4c627687
|
||||
EBUILD dhcp-4.1.0.ebuild 7546 RMD160 866e84089e01e0af7e3c786eff03a610cf4f0e77 SHA1 747648419e1ba0ce3b9746ee7171209df09be541 SHA256 e253fae73db8f3ecd0530820b97442b5cfee6bc148a297aa36df5f93f8bc6a6d
|
||||
MISC ChangeLog 28591 RMD160 fddea43ba6ef158494f448ed06895aa1ec03b594 SHA1 9d31a3a1bcf314db8cead4d14297590d3cc05941 SHA256 a426f89766b693a1f7b05c5bf7c640b905fca155090f18ca7373c6fded4242c2
|
||||
MISC metadata.xml 358 RMD160 97ecd4b6ee0a24352a71a66d5ad4fd82481156b4 SHA1 d80da2cf7c6892cdad6b681fda29e46472d68871 SHA256 8665f24cdfcc09576b595f8bd257333ff5f9ea7ee0ca2925ba6fb74d90e12415
|
||||
|
||||
@ -179,6 +179,7 @@ src_install() {
|
||||
insinto /etc/dhcp
|
||||
newins client/dhclient.conf dhclient.conf.sample
|
||||
keepdir /var/{lib,run}/dhcp
|
||||
keepdir /var/lib/dhclient
|
||||
|
||||
# Install our server files
|
||||
if ! use minimal ; then
|
||||
|
||||
@ -162,6 +162,7 @@ src_install() {
|
||||
insinto /etc/dhcp
|
||||
newins client/dhclient.conf dhclient.conf.sample
|
||||
keepdir /var/{lib,run}/dhcp
|
||||
keepdir /var/lib/dhclient
|
||||
|
||||
# Install our server files
|
||||
insinto /etc/dhcp
|
||||
|
||||
@ -160,6 +160,7 @@ src_install() {
|
||||
insinto /etc/dhcp
|
||||
newins client/dhclient.conf dhclient.conf.sample
|
||||
keepdir /var/{lib,run}/dhcp
|
||||
keepdir /var/lib/dhclient
|
||||
|
||||
# Install our server files
|
||||
insinto /etc/dhcp
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.5 2007/04/02 12:34:01 uberlord Exp $
|
||||
|
||||
opts="configtest"
|
||||
|
||||
DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
|
||||
|
||||
depend() {
|
||||
@ -15,6 +17,23 @@ get_var() {
|
||||
"${DHCPD_CHROOT}/${DHCPD_CONF}"
|
||||
}
|
||||
|
||||
checkconfig() {
|
||||
/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t 1>/dev/null 2>&1
|
||||
ret=$?
|
||||
if [ $ret -ne 0 ]; then
|
||||
eerror "${SVCNAME} has detected a syntax error in your configuration files:"
|
||||
/usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t
|
||||
fi
|
||||
|
||||
return $ret
|
||||
}
|
||||
|
||||
configtest() {
|
||||
ebegin "Checking ${SVCNAME} configuration"
|
||||
checkconfig
|
||||
eend $?
|
||||
}
|
||||
|
||||
start() {
|
||||
# Work out our cffile if it's on our DHCPD_OPTS
|
||||
case " ${DHCPD_OPTS} " in
|
||||
@ -32,6 +51,8 @@ start() {
|
||||
return 1
|
||||
fi
|
||||
|
||||
checkconfig || return 1
|
||||
|
||||
local leasefile="$(get_var lease-file-name)"
|
||||
leasefile="${DHCPD_CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}"
|
||||
if [ ! -f "${leasefile}" ] ; then
|
||||
@ -49,6 +70,8 @@ start() {
|
||||
|
||||
local pidfile="$(get_var pid-file-name)"
|
||||
pidfile="${pidfile:-/var/run/dhcp/dhcpd.pid}"
|
||||
touch "${DHCPD_CHROOT}/${pidfile}"
|
||||
chown dhcp:dhcp "${DHCPD_CHROOT}/${pidfile}"
|
||||
|
||||
ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
|
||||
start-stop-daemon --start --exec /usr/sbin/dhcpd \
|
||||
@ -63,6 +86,8 @@ start() {
|
||||
|
||||
stop() {
|
||||
local chroot="$(get_options chroot)"
|
||||
|
||||
checkconfig || return 1
|
||||
|
||||
ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
|
||||
start-stop-daemon --stop --exec /usr/sbin/dhcpd \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user