@@ -5,7 +5,7 @@

 Name:           cloud-init

 Version:        0.7.9

-Release:        3%{?dist}

+Release:        4%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -22,6 +22,7 @@ Patch3:         photon-hosts-template.patch

 Patch4:         resizePartitionUUID.patch

 Patch5:         datasource-guestinfo.patch

 Patch6:         systemd-service-changes.patch

+Patch7:         systemd-resolved-config.patch

 BuildRequires:  python3

 BuildRequires:  python3-libs

@@ -32,7 +33,7 @@ BuildRequires:  python3-ipaddr

 BuildRequires:  iproute2

 BuildRequires:  automake

-Requires:       systemd

+Requires:       systemd >= 228-38

 Requires:       net-tools

 Requires:       python3

 Requires:       python3-libs

@@ -63,6 +64,7 @@ ssh keys and to let the user run various scripts.

 %patch4 -p1

 %patch5 -p1

 %patch6 -p1

+%patch7 -p1

 find systemd -name cloud*.service | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g

@@ -200,6 +202,8 @@ systemctl daemon-reload >/dev/null 2>&1 || :

 %changelog

+*   Tue Oct 17 2017 Vinay Kulkarni <kulkarniv@vmware.com> 0.7.9-4

+-   Support configuration of systemd resolved.conf

 *   Fri Jul 28 2017 Dheeraj Shetty <dheerajs@vmware.com> 0.7.9-3

 -   Removed networking.service and NetworkManger.service from

 -   cloud-init and cloud-init-local service files

new file mode 100644

@@ -0,0 +1,64 @@

+diff -uNr cloud-init-0.7.9-orig/cloudinit/config/cc_resolv_conf.py cloud-init-0.7.9/cloudinit/config/cc_resolv_conf.py

+--- cloud-init-0.7.9-orig/cloudinit/config/cc_resolv_conf.py	2017-10-18 00:36:44.839010507 +0000

+@@ -55,10 +55,10 @@

+ 

+ frequency = PER_INSTANCE

+ 

+-distros = ['fedora', 'rhel', 'sles']

++distros = ['fedora', 'rhel', 'sles', 'photon']

+ 

+ 

+-def generate_resolv_conf(template_fn, params, target_fname="/etc/resolv.conf"):

++def generate_resolv_conf(template_fn, params, target_fname="/etc/systemd/resolved.conf"):

+     flags = []

+     false_flags = []

+ 

+@@ -104,12 +104,29 @@

+     if "resolv_conf" not in cfg:

+         log.warn("manage_resolv_conf True but no parameters provided!")

+ 

+-    template_fn = cloud.get_template_filename('resolv.conf')

++    template_fn = cloud.get_template_filename('systemd.resolved.conf')

+     if not template_fn:

+-        log.warn("No template found, not rendering /etc/resolv.conf")

++        log.warn("No template found, not rendering /etc/systemd/resolved.conf")

+         return

+ 

+     generate_resolv_conf(template_fn=template_fn, params=cfg["resolv_conf"])

++

++    cmd = ['/usr/bin/sed', '-i',  '/Domains=/d' , '/etc/systemd/network/99-dhcp-en.network']

++    util.subp(cmd)

++

++    domain_regex_str = None

++    resolv_cfg = cfg["resolv_conf"]

++    if resolv_cfg:

++        domains = resolv_cfg["searchdomains"]

++        if domains:

++            domains_regex_str = '/\[Network\]/a Domains='

++            for domain in domains:

++                domains_regex_str += domain + ' '

++    if domains_regex_str:

++        cmd = ['/usr/bin/sed', '-i', domains_regex_str, '/etc/systemd/network/99-dhcp-en.network']

++        util.subp(cmd)

++

++    util.subp(["systemctl", "restart", "systemd-networkd", "systemd-resolved"])

+     return

+ 

+ # vi: ts=4 expandtab

+diff -uNr cloud-init-0.7.9-orig/templates/systemd.resolved.conf.tmpl cloud-init-0.7.9/templates/systemd.resolved.conf.tmpl

+--- cloud-init-0.7.9-orig/templates/systemd.resolved.conf.tmpl	1970-01-01 00:00:00.000000000 +0000

+@@ -0,0 +1,12 @@

++## template:jinja

++# Your system has been configured with 'manage-resolv-conf' set to true.

++# As a result, cloud-init has written this file with configuration data

++# that it has been provided. Cloud-init, by default, will write this file

++# a single time (PER_ONCE).

++#

++[Resolve]

++LLMNR=false

++{% if nameservers is defined %}

++DNS={% for server in nameservers %}{{server}} {% endfor %}

++{% endif %}

++