diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-04-09 18:10:46 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-04-09 18:10:46 +0000 |
| commit | 585e30513af68c22b2a0274dda1f7c3ddbf2d52b (patch) | |
| tree | 0c158c1c896a6e55c33a812113f7c6e8dd8295f6 /sys-apps/baselayout | |
| parent | Deps update (diff) | |
| download | gentoo-2-585e30513af68c22b2a0274dda1f7c3ddbf2d52b.tar.gz gentoo-2-585e30513af68c22b2a0274dda1f7c3ddbf2d52b.tar.bz2 gentoo-2-585e30513af68c22b2a0274dda1f7c3ddbf2d52b.zip | |
Physically remove the domainname init script and warn the user about how to
configure /etc/conf.d/net to get similar functionality, #129248.
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 55c9d4826989..b618374db065 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,15 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.312 2006/04/08 08:26:29 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.313 2006/04/09 18:10:46 uberlord Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 09 Apr 2006; Roy Marples <uberlord@gentoo.org> + baselayout-1.12.0_pre17.ebuild: + Physically remove the domainname init script and warn the user about how to + configure /etc/conf.d/net to get similar functionality, #129248. + *baselayout-1.11.14-r7 (08 Apr 2006) 08 Apr 2006; Roy Marples <uberlord@gentoo.org> diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild index 9bc2af08088a..ae8cb0047208 100644 --- a/sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild,v 1.1 2006/04/07 23:45:09 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild,v 1.2 2006/04/09 18:10:46 uberlord Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -610,7 +610,15 @@ pkg_postinst() { echo fi - if [[ -e ${ROOT}/etc/env.d/01hostname ]] ; then - rm -f ${ROOT}/etc/env.d/01hostname + # Remove old stuff that may cause problems. + if [[ -e "${ROOT}"/etc/env.d/01hostname ]] ; then + rm -f "${ROOT}"/etc/env.d/01hostname + fi + if [[ -e "${ROOT}"/etc/init.d/domainname ]] ; then + rm -f "${ROOT}"/etc/init.d/domainname + rm -f "${ROOT}"/etc/runlevels/*/domainname + ewarn "The domainname init script has been removed in this version." + ewarn "Consult ${ROOT}/etc/conf.d/net.example for details about how" + ewarn "to apply dns/nis information to the loopback interface." fi } |