diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2005-12-22 12:54:18 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2005-12-22 12:54:18 +0000 |
| commit | 583090a5d61a05245601e729add3e69ccf5cf431 (patch) | |
| tree | 63db1a157c013b8c0b388a42356400664d858e7c /net-misc | |
| parent | Version bump (diff) | |
| download | gentoo-2-583090a5d61a05245601e729add3e69ccf5cf431.tar.gz gentoo-2-583090a5d61a05245601e729add3e69ccf5cf431.tar.bz2 gentoo-2-583090a5d61a05245601e729add3e69ccf5cf431.zip | |
Remove script, host-name and domain-name options from the sample dhclient.conf
(Portage version: 2.1_pre1)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/dhcp/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog index 3df4f36d3ea1..c605a39f9ed6 100644 --- a/net-misc/dhcp/ChangeLog +++ b/net-misc/dhcp/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/dhcp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.67 2005/12/21 14:18:30 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/ChangeLog,v 1.68 2005/12/22 12:54:18 uberlord Exp $ + + 22 Dec 2005; Roy Marples <uberlord@gentoo.org> dhcp-3.0.4_beta2-r1.ebuild: + Remove script, host-name and domain-name options from the sample dhclient.conf 21 Dec 2005; Roy Marples <uberlord@gentoo.org> dhcp-3.0.1-r1.ebuild, dhcp-3.0.3-r2.ebuild, dhcp-3.0.4_beta2-r1.ebuild: diff --git a/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild b/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild index 9bcecdf52b22..33a3fcd1f99d 100644 --- a/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild +++ b/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild,v 1.2 2005/12/21 14:18:30 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-3.0.4_beta2-r1.ebuild,v 1.3 2005/12/22 12:54:18 uberlord Exp $ inherit eutils flag-o-matic multilib toolchain-funcs @@ -57,6 +57,10 @@ src_unpack() { -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \ client/scripts/* + # Remove these options from the sample config as they conflict + # with baselayout network scripts + sed -i -e "/\(script\|host-name\|domain-name\) / d" client/dhclient.conf + # Only install different man pages if we don't have en if [[ " ${LINGUAS} " != *" en "* ]]; then # Install Japanese man pages |