Fix init script to use different config files

Package-Manager: portage-2.1.2.3

diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 88d75d53ef6160c9f3cd6fe94f7a2cdef899ab96..c1a411d9a1b97b9249f29c629163a7f3e9025315 100644 (file)
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -78,10 +78,10 @@ AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbce
 MD5 3f165a207e98ea92deb7ebfbbf4c2cf7 files/dhcpd.conf 1092
 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 files/dhcpd.conf 1092
 SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5 files/dhcpd.conf 1092
-AUX dhcpd.init 1976 RMD160 b2bc8164ebeb315ea566ee8534fe15c7fffe8f62 SHA1 c95840e6ff878447a0cac8e8096f96ee93045eac SHA256 31f6674120c983f1d297e3c14586efbde55aa4bdf0e339f1c1dcf1bb0179a9f9
-MD5 514077d47d790afd7561e4040b7a9820 files/dhcpd.init 1976
-RMD160 b2bc8164ebeb315ea566ee8534fe15c7fffe8f62 files/dhcpd.init 1976
-SHA256 31f6674120c983f1d297e3c14586efbde55aa4bdf0e339f1c1dcf1bb0179a9f9 files/dhcpd.init 1976
+AUX dhcpd.init 1989 RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 SHA1 2c611adc6425fd095740aa56d09d8aafb4fea58a SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e
+MD5 076fd6d3c4bb4e92b09d1ab7cd99eb8a files/dhcpd.init 1989
+RMD160 7f6b6858020100e47efa5d6a0809b2959e551249 files/dhcpd.init 1989
+SHA256 916bfeb81dcb3423fd4239270ac2dce2e6dc105b28a06e03b352f6bf6b30ed1e files/dhcpd.init 1989
 AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
 MD5 db84514fe15fd7d81136afbaae738f55 files/dhcrelay.conf 421
 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c files/dhcrelay.conf 421

diff --git a/net-misc/dhcp/files/dhcpd.init b/net-misc/dhcp/files/dhcpd.init
index 4f16e115f740ea16cd8df9a369caa1e2eaf9d24d..6c980fe2eadb15473dde3060729711e01f76672e 100644 (file)
--- a/net-misc/dhcp/files/dhcpd.init
+++ b/net-misc/dhcp/files/dhcpd.init
@@ -1,9 +1,9 @@
 #!/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.4 2007/03/10 20:21:39 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init,v 1.5 2007/04/02 12:34:01 uberlord Exp $
 
-DHCPD_CONF="/etc/dhcp/dhcpd.conf"
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
 
 depend() {
        need net