SHA256
1
0
forked from pool/cloud-init
cloud-init/fix-default-systemd-unit-dir.patch
Robert Schweikert 5c5fa1bc9c - 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)

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=76
2017-02-16 19:42:20 +00:00

25 lines
952 B
Diff

--- setup.py.orig
+++ setup.py
@@ -58,8 +58,8 @@ def tiny_p(cmd, capture=True):
def pkg_config_read(library, var):
fallbacks = {
'systemd': {
- 'systemdsystemunitdir': '/lib/systemd/system',
- 'systemdsystemgeneratordir': '/lib/systemd/system-generators',
+ 'systemdsystemunitdir': '/usr/lib/systemd/system',
+ 'systemdsystemgeneratordir': '/usr/lib/systemd/system-generators',
}
}
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}"