summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2016-08-18 16:43:29 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2016-08-18 16:43:29 -0500
commit3fd25247a2740bf64477f851d1f3f4c278c26639 (patch)
treeb32166106a795ad88263a066499f8becaba48a39 /app-emulation
parentdev-db/percona-toolkit: version bump to 2.2.19 (diff)
downloadgentoo-3fd25247a2740bf64477f851d1f3f4c278c26639.tar.gz
gentoo-3fd25247a2740bf64477f851d1f3f4c278c26639.tar.bz2
gentoo-3fd25247a2740bf64477f851d1f3f4c278c26639.zip
app-emulation/cloud-init: fixing the /bin/ip thing in opennebula
Package-Manager: portage-2.2.28
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch26
1 files changed, 17 insertions, 9 deletions
diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
index 83788109b89c..ddb4f38201cc 100644
--- a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
@@ -1,13 +1,21 @@
+diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
+index 7b3a76b..635a836 100644
+--- a/cloudinit/sources/DataSourceOpenNebula.py
++++ b/cloudinit/sources/DataSourceOpenNebula.py
+@@ -407,7 +407,7 @@ def read_context_disk_dir(source_dir, asuser=None):
+ # http://opennebula.org/documentation:rel3.8:cong#network_configuration
+ for k in context:
+ if re.match(r'^ETH\d+_IP$', k):
+- (out, _) = util.subp(['/sbin/ip', 'link'])
++ (out, _) = util.subp(['ip', 'link'])
+ net = OpenNebulaNetwork(out, context)
+ results['network-interfaces'] = net.gen_conf()
+ break
diff --git a/setup.py b/setup.py
-index 4abbb67..4885cb5 100755
+index bbadd7b..1578a3d 100755
--- a/setup.py
+++ b/setup.py
-@@ -1,3 +1,4 @@
-+#!/usr/bin/env python
- # vi: ts=4 expandtab
- #
- # Distutils magic for ec2-init
-@@ -74,6 +75,7 @@ INITSYS_FILES = {
+@@ -74,6 +74,7 @@ INITSYS_FILES = {
'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)],
'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
@@ -15,7 +23,7 @@ index 4abbb67..4885cb5 100755
'systemd': [f for f in (glob('systemd/*.service') +
glob('systemd/*.target')) if is_f(f)],
'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
-@@ -83,6 +85,7 @@ INITSYS_ROOTS = {
+@@ -83,6 +84,7 @@ INITSYS_ROOTS = {
'sysvinit': '/etc/rc.d/init.d',
'sysvinit_freebsd': '/usr/local/etc/rc.d',
'sysvinit_deb': '/etc/init.d',
@@ -23,7 +31,7 @@ index 4abbb67..4885cb5 100755
'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
'systemd.generators': pkg_config_read('systemd',
'systemdsystemgeneratordir'),
-@@ -203,7 +206,7 @@ setuptools.setup(
+@@ -205,7 +207,7 @@ setuptools.setup(
author='Scott Moser',
author_email='scott.moser@canonical.com',
url='http://launchpad.net/cloud-init/',