summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2006-04-09 18:10:46 +0000
committerRoy Marples <uberlord@gentoo.org>2006-04-09 18:10:46 +0000
commitb7a77066e69ca61712fea562eaa80eba012ac23e (patch)
treed9a5f1de4c9691612153eabef27f28724ef858f6 /sys-apps/baselayout
parentDeps update (diff)
downloadhistorical-b7a77066e69ca61712fea562eaa80eba012ac23e.tar.gz
historical-b7a77066e69ca61712fea562eaa80eba012ac23e.tar.bz2
historical-b7a77066e69ca61712fea562eaa80eba012ac23e.zip
Physically remove the domainname init script and warn the user about how to
configure /etc/conf.d/net to get similar functionality, #129248. Package-Manager: portage-2.1_pre7-r4
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/ChangeLog7
-rw-r--r--sys-apps/baselayout/Manifest12
-rw-r--r--sys-apps/baselayout/baselayout-1.12.0_pre17.ebuild14
3 files changed, 23 insertions, 10 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/Manifest b/sys-apps/baselayout/Manifest
index ce902695ff96..a6df87a504cd 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,6 @@
-MD5 ad6018e163a850e4048ba697028bc52c ChangeLog 71596
-RMD160 287fe9e94b02ef0c693ba1f766db277bd033a08e ChangeLog 71596
-SHA256 c89f1eaca6a5948f822701c1a18e6b6176f06ab3859d9f841b71e5d9b343ec6e ChangeLog 71596
+MD5 0a1ac1f3fd737249be52cf2b80f8780f ChangeLog 71825
+RMD160 a3cbf5727d15894c96ea4f0446e42da7930eb20d ChangeLog 71825
+SHA256 89497a99c5f4240faaca93d33751dc5763cf611073a2d9978394c5522cc15bd4 ChangeLog 71825
MD5 22a10db577b1b646d12ba31ed7b77a6c baselayout-1.11.13-r2.ebuild 19014
RMD160 3d1348291157e3f973f4ad16e4f222fd32645593 baselayout-1.11.13-r2.ebuild 19014
SHA256 236d09bf8aed1a3f73c26bdb287957a21212646ecb6eec21abaafa9ef6e3b2ef baselayout-1.11.13-r2.ebuild 19014
@@ -13,9 +13,9 @@ SHA256 02e7a275423bbb0f9ce5002e485f501d4367ad21a27772ab9a16e36fc2d7d656 baselayo
MD5 1477c97f802e043d07a97bda08cf279b baselayout-1.12.0_pre16-r3.ebuild 19378
RMD160 09fd44e7b8e7088bd022d0aff3bf5c17d7e47758 baselayout-1.12.0_pre16-r3.ebuild 19378
SHA256 bd5def9cf7b389e7866ae944344d95c6383aab20b46224f9ef7707a8f66c639c baselayout-1.12.0_pre16-r3.ebuild 19378
-MD5 a176d6d1f2a435039b91252b15d5c918 baselayout-1.12.0_pre17.ebuild 19388
-RMD160 d3b603f380a65047d5dec6d7b238afcb446f85c4 baselayout-1.12.0_pre17.ebuild 19388
-SHA256 268c7af36d64cbf57d4de547913321c7d0d429a624412b86608e5444ca6a3159 baselayout-1.12.0_pre17.ebuild 19388
+MD5 1d3a41684700da19c585deb8a07b6829 baselayout-1.12.0_pre17.ebuild 19786
+RMD160 4fa8a52da6f8c8161f7acd3aad61cff4d3ce3da9 baselayout-1.12.0_pre17.ebuild 19786
+SHA256 38c26b33e33728d92fe514ce81efcbeb4a393fcc985895424962ddc1fd213f70 baselayout-1.12.0_pre17.ebuild 19786
MD5 8d10a229861f862fca52cd8e3bc655d9 files/baselayout-1.11.0-split-out-udev.patch 7413
RMD160 48eef541397ec0a21230de93518eed8a1ea63c16 files/baselayout-1.11.0-split-out-udev.patch 7413
SHA256 397221c066cbbb65d572df431b4babde766dc92d9177005e522e0df8faa25030 files/baselayout-1.11.0-split-out-udev.patch 7413
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
}