* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-0.5.3.ebuild openrc-9999.ebuild
@ 2009-12-07 9:09 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2009-12-07 9:09 UTC (permalink / raw
To: gentoo-commits
vapier 09/12/07 09:09:26
Modified: ChangeLog openrc-0.5.3.ebuild openrc-9999.ebuild
Log:
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.
(Portage version: 2.2_rc55/cvs/Linux x86_64)
Revision Changes Path
1.101 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.100&r2=1.101
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ChangeLog 6 Dec 2009 19:00:43 -0000 1.100
+++ ChangeLog 7 Dec 2009 09:09:26 -0000 1.101
@@ -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,
1.2 sys-apps/openrc/openrc-0.5.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild?r1=1.1&r2=1.2
Index: openrc-0.5.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openrc-0.5.3.ebuild 2 Dec 2009 23:42:29 -0000 1.1
+++ openrc-0.5.3.ebuild 7 Dec 2009 09:09:26 -0000 1.2
@@ -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 @@
# 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 @@
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 @@
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
1.66 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.66&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.66&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.65&r2=1.66
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openrc-9999.ebuild 13 Nov 2009 19:40:33 -0000 1.65
+++ openrc-9999.ebuild 7 Dec 2009 09:09:26 -0000 1.66
@@ -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 @@
# 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 @@
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 @@
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-0.5.3.ebuild openrc-9999.ebuild
@ 2009-12-21 14:03 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2009-12-21 14:03 UTC (permalink / raw
To: gentoo-commits
vapier 09/12/21 14:03:40
Modified: ChangeLog openrc-0.5.3.ebuild openrc-9999.ebuild
Log:
Restore "pause" functionality to teach people to convert #218859 by Martin Mokrejš.
(Portage version: 2.2_rc60/cvs/Linux x86_64)
Revision Changes Path
1.103 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.102&r2=1.103
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- ChangeLog 21 Dec 2009 13:48:09 -0000 1.102
+++ ChangeLog 21 Dec 2009 14:03:40 -0000 1.103
@@ -1,6 +1,11 @@
# 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.102 2009/12/21 13:48:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.103 2009/12/21 14:03:40 vapier Exp $
+
+ 21 Dec 2009; Mike Frysinger <vapier@gentoo.org> openrc-0.5.3.ebuild,
+ openrc-9999.ebuild, +files/openrc-9999-pause.patch:
+ Restore "pause" functionality to teach people to convert #218859 by Martin
+ Mokrejš.
21 Dec 2009; Mike Frysinger <vapier@gentoo.org>
files/openrc-9999-msg-style.patch:
1.3 sys-apps/openrc/openrc-0.5.3.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild?r1=1.2&r2=1.3
Index: openrc-0.5.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openrc-0.5.3.ebuild 7 Dec 2009 09:09:26 -0000 1.2
+++ openrc-0.5.3.ebuild 21 Dec 2009 14:03:40 -0000 1.3
@@ -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.2 2009/12/07 09:09:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.3.ebuild,v 1.3 2009/12/21 14:03:40 vapier Exp $
EAPI="1"
@@ -68,6 +68,7 @@
sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
epatch "${FILESDIR}"/openrc-9999-msg-style.patch
+ epatch "${FILESDIR}"/openrc-9999-pause.patch
}
src_compile() {
1.67 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.67&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.67&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.66&r2=1.67
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- openrc-9999.ebuild 7 Dec 2009 09:09:26 -0000 1.66
+++ openrc-9999.ebuild 21 Dec 2009 14:03:40 -0000 1.67
@@ -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.66 2009/12/07 09:09:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.67 2009/12/21 14:03:40 vapier Exp $
EAPI="1"
@@ -68,6 +68,7 @@
sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342
sed -i '/^CFLAGS+=.*_CC_FLAGS_SH/d' mk/cc.mk #289264
epatch "${FILESDIR}"/openrc-9999-msg-style.patch
+ epatch "${FILESDIR}"/openrc-9999-pause.patch
}
src_compile() {
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-21 14:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-07 9:09 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: ChangeLog openrc-0.5.3.ebuild openrc-9999.ebuild Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2009-12-21 14:03 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox