| 1 |
vapier 08/03/30 16:06:45 |
| 2 |
|
| 3 |
Modified: openrc-0.2-r2.ebuild openrc-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Autoadd dmcrypt/mdraid/lvm init.d scripts when possible #215374. |
| 6 |
(Portage version: 2.2_pre5) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 sys-apps/openrc/openrc-0.2-r2.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: openrc-0.2-r2.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- openrc-0.2-r2.ebuild 29 Mar 2008 17:50:11 -0000 1.3 |
| 22 |
+++ openrc-0.2-r2.ebuild 30 Mar 2008 16:06:45 -0000 1.4 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.3 2008/03/29 17:50:11 jer Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2-r2.ebuild,v 1.4 2008/03/30 16:06:45 vapier Exp $ |
| 28 |
|
| 29 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 30 |
|
| 31 |
@@ -105,6 +105,22 @@ |
| 32 |
(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps |
| 33 |
} |
| 34 |
|
| 35 |
+add_boot_init() { |
| 36 |
+ local initd=$1 |
| 37 |
+ [[ -e ${ROOT}/etc/init.d/${initd} ]] || return |
| 38 |
+ [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return |
| 39 |
+ elog "Auto-adding '${initd}' service to your boot runlevel" |
| 40 |
+ ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} |
| 41 |
+} |
| 42 |
+add_boot_init_mit_config() { |
| 43 |
+ local config=$1 initd=$2 |
| 44 |
+ if [[ -e ${ROOT}${config} ]] ; then |
| 45 |
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then |
| 46 |
+ maybe_add_boot_init ${initd} |
| 47 |
+ fi |
| 48 |
+ fi |
| 49 |
+} |
| 50 |
+ |
| 51 |
pkg_preinst() { |
| 52 |
local f |
| 53 |
|
| 54 |
@@ -156,11 +172,17 @@ |
| 55 |
|
| 56 |
# baselayout boot init scripts have been split out |
| 57 |
for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do |
| 58 |
- [[ -e ${ROOT}/etc/runlevels/boot/${f} ]] && continue |
| 59 |
- elog "Auto-adding '${f}' service to your boot runlevel" |
| 60 |
- ln -snf /etc/init.d/${f} "${ROOT}"/etc/runlevels/boot/${f} |
| 61 |
+ add_boot_init ${f} |
| 62 |
done |
| 63 |
|
| 64 |
+ # Try to auto-add some addons when possible |
| 65 |
+ add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt |
| 66 |
+ add_boot_init_mit_config /etc/mdadm.conf mdraid |
| 67 |
+ [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm |
| 68 |
+ elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" |
| 69 |
+ elog "init.d scripts. If you use such a thing, make sure you have the" |
| 70 |
+ elog "required init.d scripts added to your boot runlevel." |
| 71 |
+ |
| 72 |
# Upgrade out state for baselayout-1 users |
| 73 |
if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then |
| 74 |
( |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.16 sys-apps/openrc/openrc-9999.ebuild |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.16&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.16&content-type=text/plain |
| 82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.15&r2=1.16 |
| 83 |
|
| 84 |
Index: openrc-9999.ebuild |
| 85 |
=================================================================== |
| 86 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
| 87 |
retrieving revision 1.15 |
| 88 |
retrieving revision 1.16 |
| 89 |
diff -u -r1.15 -r1.16 |
| 90 |
--- openrc-9999.ebuild 28 Mar 2008 18:56:57 -0000 1.15 |
| 91 |
+++ openrc-9999.ebuild 30 Mar 2008 16:06:45 -0000 1.16 |
| 92 |
@@ -1,6 +1,6 @@ |
| 93 |
# Copyright 1999-2008 Gentoo Foundation |
| 94 |
# Distributed under the terms of the GNU General Public License v2 |
| 95 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.15 2008/03/28 18:56:57 vapier Exp $ |
| 96 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.16 2008/03/30 16:06:45 vapier Exp $ |
| 97 |
|
| 98 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 99 |
|
| 100 |
@@ -98,6 +98,22 @@ |
| 101 |
(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps |
| 102 |
} |
| 103 |
|
| 104 |
+add_boot_init() { |
| 105 |
+ local initd=$1 |
| 106 |
+ [[ -e ${ROOT}/etc/init.d/${initd} ]] || return |
| 107 |
+ [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return |
| 108 |
+ elog "Auto-adding '${initd}' service to your boot runlevel" |
| 109 |
+ ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} |
| 110 |
+} |
| 111 |
+add_boot_init_mit_config() { |
| 112 |
+ local config=$1 initd=$2 |
| 113 |
+ if [[ -e ${ROOT}${config} ]] ; then |
| 114 |
+ if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then |
| 115 |
+ maybe_add_boot_init ${initd} |
| 116 |
+ fi |
| 117 |
+ fi |
| 118 |
+} |
| 119 |
+ |
| 120 |
pkg_preinst() { |
| 121 |
local f |
| 122 |
|
| 123 |
@@ -149,11 +165,17 @@ |
| 124 |
|
| 125 |
# baselayout boot init scripts have been split out |
| 126 |
for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do |
| 127 |
- [[ -e ${ROOT}/etc/runlevels/boot/${f} ]] && continue |
| 128 |
- elog "Auto-adding '${f}' service to your boot runlevel" |
| 129 |
- ln -snf /etc/init.d/${f} "${ROOT}"/etc/runlevels/boot/${f} |
| 130 |
+ add_boot_init ${f} |
| 131 |
done |
| 132 |
|
| 133 |
+ # Try to auto-add some addons when possible |
| 134 |
+ add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt |
| 135 |
+ add_boot_init_mit_config /etc/mdadm.conf mdraid |
| 136 |
+ [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm |
| 137 |
+ elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" |
| 138 |
+ elog "init.d scripts. If you use such a thing, make sure you have the" |
| 139 |
+ elog "required init.d scripts added to your boot runlevel." |
| 140 |
+ |
| 141 |
# Upgrade out state for baselayout-1 users |
| 142 |
if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then |
| 143 |
( |
| 144 |
|
| 145 |
|
| 146 |
|
| 147 |
1.16 sys-apps/openrc/ChangeLog |
| 148 |
|
| 149 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.16&view=markup |
| 150 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.16&content-type=text/plain |
| 151 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.15&r2=1.16 |
| 152 |
|
| 153 |
Index: ChangeLog |
| 154 |
=================================================================== |
| 155 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
| 156 |
retrieving revision 1.15 |
| 157 |
retrieving revision 1.16 |
| 158 |
diff -u -r1.15 -r1.16 |
| 159 |
--- ChangeLog 29 Mar 2008 17:50:11 -0000 1.15 |
| 160 |
+++ ChangeLog 30 Mar 2008 16:06:45 -0000 1.16 |
| 161 |
@@ -1,6 +1,10 @@ |
| 162 |
# ChangeLog for sys-apps/openrc |
| 163 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 164 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.15 2008/03/29 17:50:11 jer Exp $ |
| 165 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.16 2008/03/30 16:06:45 vapier Exp $ |
| 166 |
+ |
| 167 |
+ 30 Mar 2008; Mike Frysinger <vapier@g.o> openrc-0.2-r2.ebuild, |
| 168 |
+ openrc-9999.ebuild: |
| 169 |
+ Autoadd dmcrypt/mdraid/lvm init.d scripts when possible #215374. |
| 170 |
|
| 171 |
29 Mar 2008; Jeroen Roovers <jer@g.o> openrc-0.2-r2.ebuild: |
| 172 |
Marked ~hppa (bug #214957). |
| 173 |
|
| 174 |
|
| 175 |
|
| 176 |
-- |
| 177 |
gentoo-commits@l.g.o mailing list |
Archives