From 0875a89e8940f92f1f1ffc453395ca161e31650905208034584f4a69ee464db6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 27 Feb 2017 11:56:24 +0000 Subject: [PATCH] - add cloud-init-net-sysconfig-lp1665441.patch (lp#1665441) OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=80 --- addopenSUSEBase.patch | 14 +++++++------- ...it-fix-unicode-handling-binarydecode.patch | 4 +++- cloud-init-net-sysconfig-lp1665441.patch | 15 +++++++++++++++ ...-init-no-user-lock-if-already-locked.patch | 8 +++++--- cloud-init.changes | 5 +++++ cloud-init.spec | 2 ++ dynamicInitCmd.diff | 19 ++++++++++--------- 7 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 cloud-init-net-sysconfig-lp1665441.patch diff --git a/addopenSUSEBase.patch b/addopenSUSEBase.patch index 87c2d54..5afa0fe 100644 --- a/addopenSUSEBase.patch +++ b/addopenSUSEBase.patch @@ -1,7 +1,7 @@ -Index: cloud-init-0.7.6/cloudinit/config/cc_resolv_conf.py +Index: cloud-init-0.7.8/cloudinit/config/cc_resolv_conf.py =================================================================== ---- cloud-init-0.7.6.orig/cloudinit/config/cc_resolv_conf.py -+++ cloud-init-0.7.6/cloudinit/config/cc_resolv_conf.py +--- cloud-init-0.7.8.orig/cloudinit/config/cc_resolv_conf.py ++++ cloud-init-0.7.8/cloudinit/config/cc_resolv_conf.py @@ -58,7 +58,7 @@ LOG = logging.getLogger(__name__) frequency = PER_INSTANCE @@ -11,11 +11,11 @@ Index: cloud-init-0.7.6/cloudinit/config/cc_resolv_conf.py def generate_resolv_conf(template_fn, params, target_fname="/etc/resolv.conf"): -Index: cloud-init-0.7.6/cloudinit/distros/__init__.py +Index: cloud-init-0.7.8/cloudinit/distros/__init__.py =================================================================== ---- cloud-init-0.7.6.orig/cloudinit/distros/__init__.py -+++ cloud-init-0.7.6/cloudinit/distros/__init__.py -@@ -41,7 +41,7 @@ OSFAMILIES = { +--- cloud-init-0.7.8.orig/cloudinit/distros/__init__.py ++++ cloud-init-0.7.8/cloudinit/distros/__init__.py +@@ -46,7 +46,7 @@ OSFAMILIES = { 'redhat': ['fedora', 'rhel'], 'gentoo': ['gentoo'], 'freebsd': ['freebsd'], diff --git a/cloud-init-fix-unicode-handling-binarydecode.patch b/cloud-init-fix-unicode-handling-binarydecode.patch index 32e2801..e8c486d 100644 --- a/cloud-init-fix-unicode-handling-binarydecode.patch +++ b/cloud-init-fix-unicode-handling-binarydecode.patch @@ -1,6 +1,8 @@ +Index: cloudinit/util.py +=================================================================== --- cloudinit/util.py.orig +++ cloudinit/util.py -@@ -154,7 +154,7 @@ def target_path(target, path=None): +@@ -155,7 +155,7 @@ def target_path(target, path=None): def decode_binary(blob, encoding='utf-8'): # Converts a binary type into a text type using given encoding. diff --git a/cloud-init-net-sysconfig-lp1665441.patch b/cloud-init-net-sysconfig-lp1665441.patch new file mode 100644 index 0000000..55fc87f --- /dev/null +++ b/cloud-init-net-sysconfig-lp1665441.patch @@ -0,0 +1,15 @@ +--- cloud-init-0.7.8.orig/cloudinit/net/sysconfig.py ++++ cloud-init-0.7.8/cloudinit/net/sysconfig.py +@@ -295,10 +295,10 @@ class Renderer(renderer.Renderer): + cls._render_subnet(iface_cfg, route_cfg, iface_subnets[0]) + elif len(iface_subnets) > 1: + for i, iface_subnet in enumerate(iface_subnets, +- start=len(iface.children)): ++ start=len(iface_cfg.children)): + iface_sub_cfg = iface_cfg.copy() + iface_sub_cfg.name = "%s:%s" % (iface_name, i) +- iface.children.append(iface_sub_cfg) ++ iface_cfg.children.append(iface_sub_cfg) + cls._render_subnet(iface_sub_cfg, route_cfg, iface_subnet) + + @classmethod diff --git a/cloud-init-no-user-lock-if-already-locked.patch b/cloud-init-no-user-lock-if-already-locked.patch index 176fc60..c22026e 100644 --- a/cloud-init-no-user-lock-if-already-locked.patch +++ b/cloud-init-no-user-lock-if-already-locked.patch @@ -1,6 +1,8 @@ ---- cloud-init-0.7.5/cloudinit/distros/__init__.py.orig 2014-09-16 11:00:52.192149797 +0200 -+++ cloud-init-0.7.5/cloudinit/distros/__init__.py 2014-09-16 11:02:02.272874250 +0200 -@@ -402,8 +402,11 @@ +Index: cloud-init-0.7.8/cloudinit/distros/__init__.py +=================================================================== +--- cloud-init-0.7.8.orig/cloudinit/distros/__init__.py ++++ cloud-init-0.7.8/cloudinit/distros/__init__.py +@@ -504,8 +504,11 @@ class Distro(object): # about long names. util.subp(['passwd', '-l', name]) except Exception as e: diff --git a/cloud-init.changes b/cloud-init.changes index aeb6e51..d79f3ff 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 27 11:45:05 UTC 2017 - dmueller@suse.com + +- add cloud-init-net-sysconfig-lp1665441.patch (lp#1665441) + ------------------------------------------------------------------- Mon Feb 20 10:00:42 CET 2017 - kukuk@suse.de diff --git a/cloud-init.spec b/cloud-init.spec index 4babcbd..7520394 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -55,6 +55,7 @@ Patch27: cloud-init-sysconfig-netpathfix.patch Patch28: zypp_add_repos.diff Patch29: datasourceLocalDisk.patch Patch30: cloud-init-handle-not-implemented-query.patch +Patch32: cloud-init-net-sysconfig-lp1665441.patch BuildRequires: fdupes BuildRequires: filesystem BuildRequires: python-devel @@ -198,6 +199,7 @@ Unit tests for the cloud-init tools %patch28 -p0 %patch29 -p0 %patch30 +%patch32 -p1 %if 0%{?suse_version} && 0%{?suse_version} <= 1210 %patch40 -p1 %endif diff --git a/dynamicInitCmd.diff b/dynamicInitCmd.diff index 22180de..a5e0209 100644 --- a/dynamicInitCmd.diff +++ b/dynamicInitCmd.diff @@ -1,7 +1,9 @@ === modified file 'cloudinit/config/cc_set_passwords.py' ---- cloudinit/config/cc_set_passwords.py 2014-02-06 21:38:30 +0000 -+++ cloudinit/config/cc_set_passwords.py 2014-06-24 18:39:33 +0000 -@@ -136,7 +136,7 @@ +Index: cloudinit/config/cc_set_passwords.py +=================================================================== +--- cloudinit/config/cc_set_passwords.py.orig ++++ cloudinit/config/cc_set_passwords.py +@@ -147,7 +147,7 @@ def handle(_name, cfg, cloud, log, args) util.write_file(ssh_util.DEF_SSHD_CFG, "\n".join(lines)) try: @@ -10,11 +12,11 @@ cmd.append(cloud.distro.get_option('ssh_svcname', 'ssh')) cmd.append('restart') if 'systemctl' in cmd: # Switch action ordering - -=== modified file 'cloudinit/distros/__init__.py' ---- cloudinit/distros/__init__.py 2014-02-12 19:56:55 +0000 -+++ cloudinit/distros/__init__.py 2014-06-24 18:39:33 +0000 -@@ -79,6 +79,9 @@ +Index: cloudinit/distros/__init__.py +=================================================================== +--- cloudinit/distros/__init__.py.orig ++++ cloudinit/distros/__init__.py +@@ -88,6 +88,9 @@ class Distro(object): " no file found at %s") % (tz, tz_file)) return tz_file @@ -24,4 +26,3 @@ def get_option(self, opt_name, default=None): return self._cfg.get(opt_name, default) -