Migrate hostname by default to avoid default thrashing on conf.d/hostname #295406 by Martin Mokrejš. Also delay automatic dep tree update till after we are done screwing with /etc.

Package-Manager: portage-2.2_rc55/cvs/Linux x86_64

4 files changed, 50 insertions, 12 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 4269ac9b90ca..796d2a500ab0 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/openrc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.100 2009/12/06 19:00:43 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.101 2009/12/07 09:09:26 vapier Exp $
+
+  07 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
+  openrc-9999.ebuild:
+  Migrate hostname by default to avoid default thrashing on conf.d/hostname
+  #295406 by Martin Mokrejš. Also delay automatic dep tree update till
+  after we are done screwing with /etc.
 
   06 Dec 2009; William Hubbs <williamh@gentoo.org> -openrc-0.5.2-r2.ebuild,
   -files/openrc-0.5.2-dont-wipe-wtmp.patch,
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 22cb4545a90a..886422c5d152 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX openrc-9999-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
 AUX openrc.logrotate 71 RMD160 4e7370ca873bd917f16e2b8cfc4bc71accbf2353 SHA1 ef1f26020db432f96a1485f72a189b288ef6873b SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c
 DIST openrc-0.5.3.tar.bz2 153281 RMD160 995181494c81c376223d7df90d48e3b7eaad69ad SHA1 fd82495c94c7d68d6493bca7623fc962f9a3cb6b SHA256 1e3120906d93fb1746f00355eb42b2ee510daafdad79d7c0dea2eb48eea3ad43
-EBUILD openrc-0.5.3.ebuild 12896 RMD160 30d6016c858b2b98c3e27655f0df0a58a30e56ee SHA1 cab5c5a8db3ca3b51f47a60afde0317f8af03698 SHA256 14519f163cc0906f7cc9d7716cc8a7c6cf610a3de6e3f212b8461f07e6990455
-EBUILD openrc-9999.ebuild 12892 RMD160 2b2a6403f0807b547652d54f08c15b22f9667d40 SHA1 a8bd1873d7cbfd57b595fdcd542473cda15e3ca6 SHA256 a0a61ad8d2f9cf540ad32737d6dc5527704440e5551a2c25e38fad7adba96ee7
-MISC ChangeLog 20953 RMD160 a34ccd758f3a9abad18be07ed939e9977e4acd3f SHA1 5caf9a81354e3f8ba61d3a593bc8b8886a1a8a6f SHA256 107d830590837a2bb3440bc455ea3a194afb90cfedb0dd89324ae586fcef8255
+EBUILD openrc-0.5.3.ebuild 13233 RMD160 5f4b2899920c9f56c22fe09e110ca510b4850176 SHA1 7d9d8c376d740f3e8f06486be60cbca565f6501b SHA256 b23626bc9064713c2b58e94a4cf8b74b07a0bcd0d7581e79af075063ea15595e
+EBUILD openrc-9999.ebuild 13233 RMD160 274753edaa2ef56544455c5b2242a1c634363f15 SHA1 404345e0f39665016af92857f4f3882cdc9ee162 SHA256 73a0b27f0634407ba4d47cd3c8d3a4cae7df56d5d662f84b2405d04d7e3a040c
+MISC ChangeLog 21233 RMD160 15011b2ecc015931c3dad4f9133f43f6ca3eabac SHA1 65f47e4e486d57ded216bfa6f87ce85679d636d3 SHA256 25bec5421853667f973a180d2c3f366a76a895af2eef2ce12d001b1e368bea9d
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkscxlIACgkQlPl3HsVfCDq9sgCfZu3v6GjZtz6HoAO0FHfj8Hau
+bxUAnjHmGRom2ZLwGFXEYfLxR7KYcHa3
+=ztwa
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.5.3.ebuild b/sys-apps/openrc/openrc-0.5.3.ebuild
index 5d3530d7a0d9..619d490cdd05 100644
--- a/sys-apps/openrc/openrc-0.5.3.ebuild
+++ b/sys-apps/openrc/openrc-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild,v 1.1 2009/12/02 23:42:29 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild,v 1.2 2009/12/07 09:09:26 vapier Exp $
 
 EAPI="1"
 
@@ -170,9 +170,20 @@ pkg_preinst() {
 	# file in the CONTENTS for binary packages.
 	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
 
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${ROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
 	# upgrade timezone file ... do it before moving clock
 	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
 		(
+		unset TIMEZONE
 		source "${ROOT}"/etc/conf.d/clock
 		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
 		)
@@ -347,9 +358,6 @@ pkg_postinst() {
 		fi
 	fi
 
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
 	# /etc/conf.d/net.example is no longer valid
 	local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
 	local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
@@ -385,6 +393,9 @@ pkg_postinst() {
 		ewarn "your files to /etc/conf.d/modules and delete the directory."
 	fi
 
+	# update the dependency tree after touching all files #224171
+	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
 	elog "You should now update all files in /etc, using etc-update"
 	elog "or equivalent before restarting any services or this host."
 	elog
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index d6796f345f65..db8409469bab 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.65 2009/11/13 19:40:33 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.66 2009/12/07 09:09:26 vapier Exp $
 
 EAPI="1"
 
@@ -170,9 +170,20 @@ pkg_preinst() {
 	# file in the CONTENTS for binary packages.
 	[[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/
 
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${ROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
 	# upgrade timezone file ... do it before moving clock
 	if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then
 		(
+		unset TIMEZONE
 		source "${ROOT}"/etc/conf.d/clock
 		[[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone
 		)
@@ -347,9 +358,6 @@ pkg_postinst() {
 		fi
 	fi
 
-	# update the dependency tree bug #224171
-	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
-
 	# /etc/conf.d/net.example is no longer valid
 	local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example"
 	local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210'
@@ -385,6 +393,9 @@ pkg_postinst() {
 		ewarn "your files to /etc/conf.d/modules and delete the directory."
 	fi
 
+	# update the dependency tree after touching all files #224171
+	[[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
 	elog "You should now update all files in /etc, using etc-update"
 	elog "or equivalent before restarting any services or this host."
 	elog