forked from pool/cloud-init
Dirk Mueller
ed9aa9f0d8
* skip checking for files in /etc/sysconfig that never exist on a wickedd based system OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=108
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
Index: setup.py
|
|
===================================================================
|
|
--- setup.py.orig
|
|
+++ setup.py
|
|
@@ -52,8 +52,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]
|
|
Index: systemd/cloud-init-generator
|
|
===================================================================
|
|
--- systemd/cloud-init-generator.orig
|
|
+++ systemd/cloud-init-generator
|
|
@@ -9,7 +9,7 @@ DISABLE="disabled"
|
|
FOUND="found"
|
|
NOTFOUND="notfound"
|
|
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}"
|