From ed9aa9f0d8de806daae5768a557e1760b3d7207895231af190b07f6018bbdfcc Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 16 Feb 2018 13:24:07 +0000
Subject: [PATCH] - update cloud-init-sysconfig-netpathfix.patch:   * 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
---
 ...-init-no-user-lock-if-already-locked.patch |  8 +++----
 cloud-init-python2-sigpipe.patch              |  4 +++-
 cloud-init-sysconfig-netpathfix.patch         | 22 +++++++++++--------
 cloud-init.changes                            |  7 ++++++
 fix-default-systemd-unit-dir.patch            |  6 ++++-
 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/cloud-init-no-user-lock-if-already-locked.patch b/cloud-init-no-user-lock-if-already-locked.patch
index c22026e..2544981 100644
--- a/cloud-init-no-user-lock-if-already-locked.patch
+++ b/cloud-init-no-user-lock-if-already-locked.patch
@@ -1,8 +1,8 @@
-Index: cloud-init-0.7.8/cloudinit/distros/__init__.py
+Index: cloud-init-17.2/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):
+--- cloud-init-17.2.orig/cloudinit/distros/__init__.py
++++ cloud-init-17.2/cloudinit/distros/__init__.py
+@@ -551,8 +551,11 @@ class Distro(object):
              # about long names.
              util.subp(['passwd', '-l', name])
          except Exception as e:
diff --git a/cloud-init-python2-sigpipe.patch b/cloud-init-python2-sigpipe.patch
index 3ae8b1f..d418467 100644
--- a/cloud-init-python2-sigpipe.patch
+++ b/cloud-init-python2-sigpipe.patch
@@ -1,3 +1,5 @@
+Index: cloudinit/util.py
+===================================================================
 --- cloudinit/util.py.orig
 +++ cloudinit/util.py
 @@ -35,6 +35,7 @@ import time
@@ -8,7 +10,7 @@
  from six.moves.urllib import parse as urlparse
  
  import six
-@@ -1815,7 +1816,8 @@ def subp(args, data=None, rcs=None, env=
+@@ -1858,7 +1859,8 @@ def subp(args, data=None, rcs=None, env=
  
          sp = subprocess.Popen(args, stdout=stdout,
                                stderr=stderr, stdin=stdin,
diff --git a/cloud-init-sysconfig-netpathfix.patch b/cloud-init-sysconfig-netpathfix.patch
index a1da7dd..5fc41e4 100644
--- a/cloud-init-sysconfig-netpathfix.patch
+++ b/cloud-init-sysconfig-netpathfix.patch
@@ -1,6 +1,8 @@
+Index: cloudinit/net/sysconfig.py
+===================================================================
 --- cloudinit/net/sysconfig.py.orig
 +++ cloudinit/net/sysconfig.py
-@@ -88,8 +88,8 @@ class ConfigMap(object):
+@@ -91,8 +91,8 @@ class ConfigMap(object):
  class Route(ConfigMap):
      """Represents a route configuration."""
  
@@ -11,7 +13,7 @@
  
      def __init__(self, route_name, base_sysconf_dir):
          super(Route, self).__init__()
-@@ -166,7 +166,7 @@ class Route(ConfigMap):
+@@ -169,7 +169,7 @@ class Route(ConfigMap):
  class NetInterface(ConfigMap):
      """Represents a sysconfig/networking-script (and its config + children)."""
  
@@ -20,14 +22,16 @@
  
      iface_types = {
          'ethernet': 'Ethernet',
-@@ -602,8 +602,8 @@ def available(target=None):
+@@ -616,12 +616,6 @@ def available(target=None):
+         if not util.which(p, search=search, target=target):
              return False
  
-     expected_paths = [
+-    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
+-    for p in expected_paths:
+-        if not os.path.isfile(util.target_path(target, p)):
+-            return False
+     return True
+ 
+ 
diff --git a/cloud-init.changes b/cloud-init.changes
index eb9cace..58b0f8a 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Feb 16 13:23:00 UTC 2018 - dmueller@suse.com
+
+- update cloud-init-sysconfig-netpathfix.patch:
+  * skip checking for files in /etc/sysconfig that never exist
+  on a wickedd based system
+
 -------------------------------------------------------------------
 Tue Feb 13 19:39:50 UTC 2018 - rjschwei@suse.com
 
diff --git a/fix-default-systemd-unit-dir.patch b/fix-default-systemd-unit-dir.patch
index ed46a2e..9b80434 100644
--- a/fix-default-systemd-unit-dir.patch
+++ b/fix-default-systemd-unit-dir.patch
@@ -1,6 +1,8 @@
+Index: setup.py
+===================================================================
 --- setup.py.orig
 +++ setup.py
-@@ -49,8 +49,8 @@ def tiny_p(cmd, capture=True):
+@@ -52,8 +52,8 @@ def tiny_p(cmd, capture=True):
  def pkg_config_read(library, var):
      fallbacks = {
          'systemd': {
@@ -11,6 +13,8 @@
          }
      }
      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"