* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog
@ 2008-03-30 16:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-30 16:06 UTC (permalink / raw
To: gentoo-commits
vapier 08/03/30 16:06:45
Modified: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog
Log:
Autoadd dmcrypt/mdraid/lvm init.d scripts when possible #215374.
(Portage version: 2.2_pre5)
Revision Changes Path
1.4 sys-apps/openrc/openrc-0.2-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?r1=1.3&r2=1.4
Index: openrc-0.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openrc-0.2-r2.ebuild 29 Mar 2008 17:50:11 -0000 1.3
+++ openrc-0.2-r2.ebuild 30 Mar 2008 16:06:45 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.3 2008/03/29 17:50:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.4 2008/03/30 16:06:45 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -105,6 +105,22 @@
(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
}
+add_boot_init() {
+ local initd=$1
+ [[ -e ${ROOT}/etc/init.d/${initd} ]] || return
+ [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
+ elog "Auto-adding '${initd}' service to your boot runlevel"
+ ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
+}
+add_boot_init_mit_config() {
+ local config=$1 initd=$2
+ if [[ -e ${ROOT}${config} ]] ; then
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+ maybe_add_boot_init ${initd}
+ fi
+ fi
+}
+
pkg_preinst() {
local f
@@ -156,11 +172,17 @@
# baselayout boot init scripts have been split out
for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
- [[ -e ${ROOT}/etc/runlevels/boot/${f} ]] && continue
- elog "Auto-adding '${f}' service to your boot runlevel"
- ln -snf /etc/init.d/${f} "${ROOT}"/etc/runlevels/boot/${f}
+ add_boot_init ${f}
done
+ # Try to auto-add some addons when possible
+ add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
+ add_boot_init_mit_config /etc/mdadm.conf mdraid
+ [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+ elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
+ elog "init.d scripts. If you use such a thing, make sure you have the"
+ elog "required init.d scripts added to your boot runlevel."
+
# Upgrade out state for baselayout-1 users
if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
(
1.16 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.15&r2=1.16
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openrc-9999.ebuild 28 Mar 2008 18:56:57 -0000 1.15
+++ openrc-9999.ebuild 30 Mar 2008 16:06:45 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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.15 2008/03/28 18:56:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.16 2008/03/30 16:06:45 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -98,6 +98,22 @@
(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
}
+add_boot_init() {
+ local initd=$1
+ [[ -e ${ROOT}/etc/init.d/${initd} ]] || return
+ [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return
+ elog "Auto-adding '${initd}' service to your boot runlevel"
+ ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd}
+}
+add_boot_init_mit_config() {
+ local config=$1 initd=$2
+ if [[ -e ${ROOT}${config} ]] ; then
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then
+ maybe_add_boot_init ${initd}
+ fi
+ fi
+}
+
pkg_preinst() {
local f
@@ -149,11 +165,17 @@
# baselayout boot init scripts have been split out
for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do
- [[ -e ${ROOT}/etc/runlevels/boot/${f} ]] && continue
- elog "Auto-adding '${f}' service to your boot runlevel"
- ln -snf /etc/init.d/${f} "${ROOT}"/etc/runlevels/boot/${f}
+ add_boot_init ${f}
done
+ # Try to auto-add some addons when possible
+ add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
+ add_boot_init_mit_config /etc/mdadm.conf mdraid
+ [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
+ elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
+ elog "init.d scripts. If you use such a thing, make sure you have the"
+ elog "required init.d scripts added to your boot runlevel."
+
# Upgrade out state for baselayout-1 users
if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then
(
1.16 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.15&r2=1.16
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog 29 Mar 2008 17:50:11 -0000 1.15
+++ ChangeLog 30 Mar 2008 16:06:45 -0000 1.16
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.15 2008/03/29 17:50:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.16 2008/03/30 16:06:45 vapier Exp $
+
+ 30 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r2.ebuild,
+ openrc-9999.ebuild:
+ Autoadd dmcrypt/mdraid/lvm init.d scripts when possible #215374.
29 Mar 2008; Jeroen Roovers <jer@gentoo.org> openrc-0.2-r2.ebuild:
Marked ~hppa (bug #214957).
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog
@ 2008-03-30 17:42 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-30 17:42 UTC (permalink / raw
To: gentoo-commits
vapier 08/03/30 17:42:11
Modified: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog
Log:
Move patches here so we get them in releases.
(Portage version: 2.2_pre5)
Revision Changes Path
1.5 sys-apps/openrc/openrc-0.2-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?r1=1.4&r2=1.5
Index: openrc-0.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openrc-0.2-r2.ebuild 30 Mar 2008 16:06:45 -0000 1.4
+++ openrc-0.2-r2.ebuild 30 Mar 2008 17:42:10 -0000 1.5
@@ -1,12 +1,12 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.4 2008/03/30 16:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.5 2008/03/30 17:42:10 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
- EGIT_BRANCH="Gentoo"
+ EGIT_BRANCH="master"
inherit git
else
SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2
@@ -63,6 +63,7 @@
unpack ${A}
fi
cd "${S}"
+ epatch "${FILESDIR}"/9999/*.patch
epatch "${FILESDIR}"/${PN}-0.2-freebsd-install-rc.patch
epatch "${FILESDIR}"/${PN}-0.2-multiple-ntp-servers.patch
1.17 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.16&r2=1.17
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openrc-9999.ebuild 30 Mar 2008 16:06:45 -0000 1.16
+++ openrc-9999.ebuild 30 Mar 2008 17:42:10 -0000 1.17
@@ -1,12 +1,12 @@
# Copyright 1999-2008 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.16 2008/03/30 16:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.17 2008/03/30 17:42:10 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git"
- EGIT_BRANCH="Gentoo"
+ EGIT_BRANCH="master"
inherit git
else
SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2
@@ -61,6 +61,7 @@
unpack ${A}
fi
cd "${S}"
+ epatch "${FILESDIR}"/9999/*.patch
}
src_compile() {
1.17 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.16&r2=1.17
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog 30 Mar 2008 16:06:45 -0000 1.16
+++ ChangeLog 30 Mar 2008 17:42:10 -0000 1.17
@@ -1,6 +1,12 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.16 2008/03/30 16:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.17 2008/03/30 17:42:10 vapier Exp $
+
+ 30 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+ +files/9999/0001-msg-style.patch, +files/9999/0003-KV.patch,
+ +files/9999/0002-useful-functions.patch, openrc-0.2-r2.ebuild,
+ openrc-9999.ebuild:
+ Move patches here so we get them in releases.
30 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r2.ebuild,
openrc-9999.ebuild:
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog
@ 2008-03-31 16:09 Mike Frysinger (vapier)
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2008-03-31 16:09 UTC (permalink / raw
To: gentoo-commits
vapier 08/03/31 16:09:00
Modified: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog
Log:
also add device-mapper based on /etc/dmtab
(Portage version: 2.2_pre5)
Revision Changes Path
1.6 sys-apps/openrc/openrc-0.2-r2.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?r1=1.5&r2=1.6
Index: openrc-0.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openrc-0.2-r2.ebuild 30 Mar 2008 17:42:10 -0000 1.5
+++ openrc-0.2-r2.ebuild 31 Mar 2008 16:09:00 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.5 2008/03/30 17:42:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.6 2008/03/31 16:09:00 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -179,6 +179,7 @@
# Try to auto-add some addons when possible
add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
add_boot_init_mit_config /etc/mdadm.conf mdraid
+ add_boot_init_mit_config /etc/dmtab device-mapper
[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
elog "init.d scripts. If you use such a thing, make sure you have the"
1.18 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.17&r2=1.18
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openrc-9999.ebuild 30 Mar 2008 17:42:10 -0000 1.17
+++ openrc-9999.ebuild 31 Mar 2008 16:09:00 -0000 1.18
@@ -1,6 +1,6 @@
# Copyright 1999-2008 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.17 2008/03/30 17:42:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.18 2008/03/31 16:09:00 vapier Exp $
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -172,6 +172,7 @@
# Try to auto-add some addons when possible
add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt
add_boot_init_mit_config /etc/mdadm.conf mdraid
+ add_boot_init_mit_config /etc/dmtab device-mapper
[[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm
elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone"
elog "init.d scripts. If you use such a thing, make sure you have the"
1.18 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.17&r2=1.18
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog 30 Mar 2008 17:42:10 -0000 1.17
+++ ChangeLog 31 Mar 2008 16:09:00 -0000 1.18
@@ -1,6 +1,6 @@
# ChangeLog for sys-apps/openrc
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.17 2008/03/30 17:42:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.18 2008/03/31 16:09:00 vapier Exp $
30 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+files/9999/0001-msg-style.patch, +files/9999/0003-KV.patch,
@@ -10,7 +10,8 @@
30 Mar 2008; Mike Frysinger <vapier@gentoo.org> openrc-0.2-r2.ebuild,
openrc-9999.ebuild:
- Autoadd dmcrypt/mdraid/lvm init.d scripts when possible #215374.
+ Autoadd device-mapper/dmcrypt/mdraid/lvm init.d scripts when
+ possible #215374.
29 Mar 2008; Jeroen Roovers <jer@gentoo.org> openrc-0.2-r2.ebuild:
Marked ~hppa (bug #214957).
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-31 16:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-30 16:06 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2008-03-30 17:42 Mike Frysinger (vapier)
2008-03-31 16:09 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