- Add a modified version of fix-default-systemd-unit-dir.patch

+ Removed pre-maturely, still needs 1 part of the patch

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=120

cloud-init.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 24 21:42:43 UTC 2018 - rjschwei@suse.com
+
+- Add a modified version of fix-default-systemd-unit-dir.patch
+  + Removed pre-maturely, still needs 1 part of the patch
+
 -------------------------------------------------------------------
 Fri Aug 24 19:29:03 UTC 2018 - rjschwei@suse.com
 

cloud-init.spec

@@ -58,7 +58,15 @@ Patch43:        cloud-init-no-trace-empt-sect.patch
 # FIXME cloud-init-setpath-gen.patch (boo#1093501)
 # Merged upstream remove for 18.3
 Patch44:        cloud-init-setpath-dsitentify.patch
-#Patch45:        cloud-init-network-online.patch
+# We are going to fix the network setup upstream, two parts:
+# 1. clod-init will get it's own dhcp setup to no longer rely on dhclient
+# 2. we will switch the SUSE implementation to the sysconfig renderer to
+# fix network config setup issues
+# Until then, expected with 18.4 or 18.5 we will carry this patch
+Patch45:        cloud-init-network-online.patch
+# The generator will become a template upstream, 18.4 or 18.5, until then
+# fix the generator directly
+Patch46:        fix-default-systemd-unit-dir.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 # pkg-config is needed to find correct systemd unit dir
@@ -205,7 +213,8 @@ Documentation and examples for cloud-init tools
 %patch42
 %patch43
 %patch44
-#%patch45 -p1
+%patch45 -p1
+%patch46 -p1
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1315

fix-default-systemd-unit-dir.patch

@@ -0,0 +1,13 @@
+Index: cloud-init-18.2/systemd/cloud-init-generator
+===================================================================
+--- cloud-init-18.2.orig/systemd/cloud-init-generator
++++ cloud-init-18.2/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}"