forked from pool/cloud-init
Robert Schweikert
738f268769
+ Version numbering scheme change now YY.NUMBER_OF_RELESE_THAT_YEAR
+ Remove cloud.cfg.suse, use generated default config file
+ Remove addopenSUSEBase.patch, included upstream
+ Remove suseIntegratedHandler.patch, included upstream
+ Remove openSUSEhostsTemplate.diff, included upstream
+ Remove cloud-init-handle-no-carrier.patch, included upstream
+ Remove cloud-init-digital-ocean-datasource.patch,
use upstream implementation
+ Remove cloud-init-digital-ocean-datasource-enable-by-default.patch,
use upstream implementation
+ Remove cloud-init-fix-unicode-handling-binarydecode.patch,
included upstream
+ Remove cloud-init-no-dmidecode-on-ppc64.patch, included upstream
+ Remove dataSourceOpenNebula.patch, use upstream implementation
+ Remove setupSUSEsysVInit.diff, included upstream
+ Remove SUSEsysVInit.diff, included upstream
+ Remove cloud-init-finalbeforelogin.patch, don't block login
+ Remove cloud-init-handle-not-implemented-query.patch, query option removed
+ Remove cloud-init-spceandtabs-clean.patch, indentation fixed upstream
+ Remove dynamicInitCmd.diff, different solution from upstream
+ Added cloud-init-more-tasks.patch, (bsc#1047363)
replace cloud-init-finalbeforelogin.patch
+ Forward port cloud-init-python2-sigpipe.patch
+ Remove cloud-init-net-eni.patch, included upstream
+ Remove cloud-init-service.patch, included upstream
+ Forward port cloud-init-sysconfig-netpathfix.patch
+ Remove cloud-init-net-sysconfig-lp1665441.patch, included upstream
+ Remove cloud-init-python26.patch, included upstream
+ Add cloud-init-tests-set-exec.patch
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=88
25 lines
945 B
Diff
25 lines
945 B
Diff
--- setup.py.orig
|
|
+++ setup.py
|
|
@@ -49,8 +49,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
|
|
@@ -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}"
|