rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

- Update fix-default-systemd-unit-dir.patch (bsc#1024709)

Browse Source 
+ based on work by Thomas Abraham
- Add cloud-init-handle-not-implemented-query.patch (boo#1017832)

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=76
This commit is contained in:
Robert Schweikert 2017-02-16 19:42:20 +00:00 committed by Git OBS Bridge
parent c332cc9b7b
commit 5c5fa1bc9c
4 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cloud-init-handle-not-implemented-query.patch Normal file
View File

@ -0,0 +1,13 @@
--- cloudinit/cmd/main.py.orig
+++ cloudinit/cmd/main.py
@@ -681,6 +681,10 @@ def main(sysv_args=None):
rname, rdesc = ("dhclient-hook",
"running dhclient-hook module")
+ elif name == 'query':
+ print 'Action query is not yet implemented'
+ sys.exit(1)
+
args.reporter = events.ReportEventStack(
rname, rdesc, reporting_enabled=report_on)

7
cloud-init.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 16 19:39:16 UTC 2017 - rjschwei@suse.com
- Update fix-default-systemd-unit-dir.patch (bsc#1024709)
+ based on work by Thomas Abraham
- Add cloud-init-handle-not-implemented-query.patch (boo#1017832)
-------------------------------------------------------------------
Mon Jan 23 20:52:03 CET 2017 - kukuk@suse.de

2
cloud-init.spec
View File

@ -54,6 +54,7 @@ Patch26: cloud-init-digital-ocean-datasource-enable-by-default.patch
Patch27: cloud-init-sysconfig-netpathfix.patch
Patch28: zypp_add_repos.diff
Patch29: datasourceLocalDisk.patch
Patch30: cloud-init-handle-not-implemented-query.patch
BuildRequires: fdupes
BuildRequires: filesystem
BuildRequires: python-devel
@ -196,6 +197,7 @@ Unit tests for the cloud-init tools
%patch27
%patch28 -p0
%patch29 -p0
%patch30
%if 0%{?suse_version} && 0%{?suse_version} <= 1210
%patch40 -p1
%endif

11
fix-default-systemd-unit-dir.patch
View File

@ -11,3 +11,14 @@
}
}
cmd = ['pkg-config', '--variable=%s' % var, library]
--- systemd/cloud-init-generator.orig
+++ systemd/cloud-init-generator
@@ -7,7 +7,7 @@ LOG_D="/run/cloud-init"
ENABLE="enabled"
DISABLE="disabled"
RUN_ENABLED_FILE="$LOG_D/$ENABLE"
-CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"
+CLOUD_SYSTEM_TARGET="/usr/lib/systemd/system/cloud-init.target"
CLOUD_TARGET_NAME="cloud-init.target"
# lxc sets 'container', but lets make that explicitly a global
CONTAINER="${container}"