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
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
--- cloudinit/net/sysconfig.py.orig
|
|
+++ cloudinit/net/sysconfig.py
|
|
@@ -88,8 +88,8 @@ class ConfigMap(object):
|
|
class Route(ConfigMap):
|
|
"""Represents a route configuration."""
|
|
|
|
- route_fn_tpl_ipv4 = '%(base)s/network-scripts/route-%(name)s'
|
|
- route_fn_tpl_ipv6 = '%(base)s/network-scripts/route6-%(name)s'
|
|
+ route_fn_tpl_ipv4 = '%(base)s/network/route-%(name)s'
|
|
+ route_fn_tpl_ipv6 = '%(base)s/network/route6-%(name)s'
|
|
|
|
def __init__(self, route_name, base_sysconf_dir):
|
|
super(Route, self).__init__()
|
|
@@ -166,7 +166,7 @@ class Route(ConfigMap):
|
|
class NetInterface(ConfigMap):
|
|
"""Represents a sysconfig/networking-script (and its config + children)."""
|
|
|
|
- iface_fn_tpl = '%(base)s/network-scripts/ifcfg-%(name)s'
|
|
+ iface_fn_tpl = '%(base)s/network/ifcfg-%(name)s'
|
|
|
|
iface_types = {
|
|
'ethernet': 'Ethernet',
|
|
@@ -602,8 +602,8 @@ def available(target=None):
|
|
return False
|
|
|
|
expected_paths = [
|
|
- 'etc/sysconfig/network-scripts/network-functions',
|
|
- 'etc/sysconfig/network-scripts/ifdown-eth']
|
|
+ 'etc/sysconfig/network/network-functions',
|
|
+ 'etc/sysconfig/network/ifdown-eth']
|
|
for p in expected_paths:
|
|
if not os.path.isfile(util.target_path(target, p)):
|
|
return False
|