[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

[Matt Thode]

commit:     69e8a6f8023958ca82d4f8d2692ce100ad29cf5d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 16:10:50 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 16:12:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e8a6f8

app-emulation/cloud-init: fixing runlevel stuff

Package-Manager: portage-2.3.0

 ...nit-0.7.8.ebuild => cloud-init-0.7.8-r1.ebuild} |  9 +++++++-
 .../files/cloud-init-0.7.8-gentooinit.patch        | 25 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
similarity index 87%
rename from app-emulation/cloud-init/cloud-init-0.7.8.ebuild
rename to app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
index 2a4ecb7..f3a40a9 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 CDEPEND="
@@ -84,3 +84,10 @@ python_install_all() {
 	systemd_dounit "${S}"/systemd/cloud-init-local.service
 	systemd_dounit "${S}"/systemd/cloud-init.service
 }
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
index b80a60a..ff0e014 100644
--- a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
@@ -11,3 +11,28 @@ index bbadd7b..1578a3d 100755
      scripts=['tools/cloud-init-per'],
      license='GPLv3',
      data_files=data_files,
+diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init
+index 5afc0f2..531a715 100644
+--- a/sysvinit/gentoo/cloud-init
++++ b/sysvinit/gentoo/cloud-init
+@@ -2,6 +2,7 @@
+ # add depends for network, dns, fs etc
+ depend() {
+   after cloud-init-local
++  after net
+   before cloud-config
+   provide cloud-init
+ }
+diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local
+index 9bd0b56..0f8cf65 100644
+--- a/sysvinit/gentoo/cloud-init-local
++++ b/sysvinit/gentoo/cloud-init-local
+@@ -2,7 +2,7 @@
+ 
+ depend() {
+   after localmount
+-  after netmount
++  before net
+   before cloud-init
+   provide cloud-init-local
+ }