| 1 |
vapier 09/08/23 09:19:11 |
| 2 |
|
| 3 |
Modified: ChangeLog openrc-0.4.3-r3.ebuild openrc-9999.ebuild |
| 4 |
Log: |
| 5 |
Make sure ${ROOT}/etc/runlevels exists early enough #277323 by Ed Wildgoose. |
| 6 |
(Portage version: 2.2_rc38/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.76 sys-apps/openrc/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.76&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.76&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.75&r2=1.76 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v |
| 18 |
retrieving revision 1.75 |
| 19 |
retrieving revision 1.76 |
| 20 |
diff -u -r1.75 -r1.76 |
| 21 |
--- ChangeLog 11 Jul 2009 15:12:25 -0000 1.75 |
| 22 |
+++ ChangeLog 23 Aug 2009 09:19:10 -0000 1.76 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for sys-apps/openrc |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.75 2009/07/11 15:12:25 robbat2 Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.76 2009/08/23 09:19:10 vapier Exp $ |
| 28 |
+ |
| 29 |
+ 23 Aug 2009; Mike Frysinger <vapier@g.o> openrc-0.4.3-r3.ebuild, |
| 30 |
+ openrc-9999.ebuild: |
| 31 |
+ Make sure ${ROOT}/etc/runlevels exists early enough #277323 by Ed |
| 32 |
+ Wildgoose. |
| 33 |
|
| 34 |
11 Jul 2009; Robin H. Johnson <robbat2@g.o> |
| 35 |
+files/0.4.3/0003-command-line-size-fix.patch, openrc-0.4.3-r3.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.4 sys-apps/openrc/openrc-0.4.3-r3.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild?rev=1.4&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild?rev=1.4&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild?r1=1.3&r2=1.4 |
| 44 |
|
| 45 |
Index: openrc-0.4.3-r3.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild,v |
| 48 |
retrieving revision 1.3 |
| 49 |
retrieving revision 1.4 |
| 50 |
diff -u -r1.3 -r1.4 |
| 51 |
--- openrc-0.4.3-r3.ebuild 11 Jul 2009 15:12:25 -0000 1.3 |
| 52 |
+++ openrc-0.4.3-r3.ebuild 23 Aug 2009 09:19:10 -0000 1.4 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2009 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild,v 1.3 2009/07/11 15:12:25 robbat2 Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.3-r3.ebuild,v 1.4 2009/08/23 09:19:10 vapier Exp $ |
| 58 |
|
| 59 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 60 |
|
| 61 |
@@ -111,11 +111,19 @@ |
| 62 |
|
| 63 |
add_boot_init() { |
| 64 |
local initd=$1 |
| 65 |
- # if the initscript is not going to be installed and is not |
| 66 |
+ # if the initscript is not going to be installed and is not |
| 67 |
# currently installed, return |
| 68 |
[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ |
| 69 |
|| return |
| 70 |
[[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return |
| 71 |
+ |
| 72 |
+ # if runlevels dont exist just yet, then create it but still flag |
| 73 |
+ # to pkg_postinst that it needs real setup #277323 |
| 74 |
+ if [[ ! -d ${ROOT}/etc/runlevels/boot ]] ; then |
| 75 |
+ mkdir -p "${ROOT}"/etc/runlevels/boot |
| 76 |
+ touch "${ROOT}"/etc/runlevels/.add_boot_init.created |
| 77 |
+ fi |
| 78 |
+ |
| 79 |
elog "Auto-adding '${initd}' service to your boot runlevel" |
| 80 |
ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} |
| 81 |
} |
| 82 |
@@ -288,9 +296,10 @@ |
| 83 |
[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net |
| 84 |
|
| 85 |
# Make our runlevels if they don't exist |
| 86 |
- if [[ ! -e ${ROOT}/etc/runlevels ]] ; then |
| 87 |
+ if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then |
| 88 |
einfo "Copying across default runlevels" |
| 89 |
cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc |
| 90 |
+ rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created |
| 91 |
else |
| 92 |
if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then |
| 93 |
mkdir -p "${ROOT}"/etc/runlevels/sysinit |
| 94 |
|
| 95 |
|
| 96 |
|
| 97 |
1.51 sys-apps/openrc/openrc-9999.ebuild |
| 98 |
|
| 99 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.51&view=markup |
| 100 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.51&content-type=text/plain |
| 101 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.50&r2=1.51 |
| 102 |
|
| 103 |
Index: openrc-9999.ebuild |
| 104 |
=================================================================== |
| 105 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v |
| 106 |
retrieving revision 1.50 |
| 107 |
retrieving revision 1.51 |
| 108 |
diff -u -r1.50 -r1.51 |
| 109 |
--- openrc-9999.ebuild 15 Jun 2009 11:11:23 -0000 1.50 |
| 110 |
+++ openrc-9999.ebuild 23 Aug 2009 09:19:10 -0000 1.51 |
| 111 |
@@ -1,6 +1,6 @@ |
| 112 |
# Copyright 1999-2009 Gentoo Foundation |
| 113 |
# Distributed under the terms of the GNU General Public License v2 |
| 114 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.50 2009/06/15 11:11:23 zzam Exp $ |
| 115 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.51 2009/08/23 09:19:10 vapier Exp $ |
| 116 |
|
| 117 |
inherit eutils flag-o-matic multilib toolchain-funcs |
| 118 |
|
| 119 |
@@ -107,11 +107,19 @@ |
| 120 |
|
| 121 |
add_boot_init() { |
| 122 |
local initd=$1 |
| 123 |
- # if the initscript is not going to be installed and is not |
| 124 |
+ # if the initscript is not going to be installed and is not |
| 125 |
# currently installed, return |
| 126 |
[[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ |
| 127 |
|| return |
| 128 |
[[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return |
| 129 |
+ |
| 130 |
+ # if runlevels dont exist just yet, then create it but still flag |
| 131 |
+ # to pkg_postinst that it needs real setup #277323 |
| 132 |
+ if [[ ! -d ${ROOT}/etc/runlevels/boot ]] ; then |
| 133 |
+ mkdir -p "${ROOT}"/etc/runlevels/boot |
| 134 |
+ touch "${ROOT}"/etc/runlevels/.add_boot_init.created |
| 135 |
+ fi |
| 136 |
+ |
| 137 |
elog "Auto-adding '${initd}' service to your boot runlevel" |
| 138 |
ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} |
| 139 |
} |
| 140 |
@@ -284,9 +292,10 @@ |
| 141 |
[[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net |
| 142 |
|
| 143 |
# Make our runlevels if they don't exist |
| 144 |
- if [[ ! -e ${ROOT}/etc/runlevels ]] ; then |
| 145 |
+ if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then |
| 146 |
einfo "Copying across default runlevels" |
| 147 |
cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc |
| 148 |
+ rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created |
| 149 |
else |
| 150 |
if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then |
| 151 |
mkdir -p "${ROOT}"/etc/runlevels/sysinit |
Archives