new file mode 100644

@@ -0,0 +1,25 @@

+diff -rup cloud-init-0.7.9/requirements.txt cloud-init-0.7.9-new/requirements.txt

+--- cloud-init-0.7.9/requirements.txt	2016-12-23 08:37:45.000000000 -0800

+@@ -27,9 +27,6 @@ configobj>=5.0.2

+ # All new style configurations are in the yaml format

+ pyyaml

+ 

+-# The new main entrypoint uses argparse instead of optparse

+-argparse

+-

+ # Requests handles ssl correctly!

+ requests

+ 

+diff -rup cloud-init-0.7.9/setup.py cloud-init-0.7.9-new/setup.py

+--- cloud-init-0.7.9/setup.py	2016-12-23 08:37:45.000000000 -0800

+@@ -185,8 +185,6 @@ else:

+ 

+ 

+ requirements = read_requires()

+-if sys.version_info < (3,):

+-    requirements.append('cheetah')

+ 

+ setuptools.setup(

+     name='cloud-init',

deleted file mode 100644

@@ -1,13 +0,0 @@

-diff -uNr cloud-init-0.7.6-orig/config/cloud.cfg.d/05_logging.cfg cloud-init-0.7.6/config/cloud.cfg.d/05_logging.cfg

-+++ cloud-init-0.7.6/config/cloud.cfg.d/05_logging.cfg	2015-06-17 21:28:29.676352327 -0700

-@@ -54,7 +54,8 @@

- 

- log_cfgs:

- # These will be joined into a string that defines the configuration

-- - [ *log_base, *log_syslog ]

-+# Suppress log_syslog to allow logging to /var/log/cloud-init.log

-+# - [ *log_base, *log_syslog ]

- # These will be joined into a string that defines the configuration

-  - [ *log_base, *log_file ]

- # A file path can also be used

@@ -1,36 +1,46 @@

 Name:           cloud-init

-Version:        0.7.6

-Release:        17%{?dist}

+Version:        0.7.9

+Release:        1%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

 URL:            http://launchpad.net/cloud-init

 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz

-%define sha1 cloud-init=9af02f68d68abce91463bec22b17964d1618e1da

+%define sha1 cloud-init=3b4345267e72e28b877e2e3f0735c1f672674cfc

 Source1:        cloud-photon.cfg

 Patch0:         photon-distro.patch

-Patch1:         cloud-init-log.patch

+Patch1:         change-requires.patch

 Patch2:         vca-admin-pwd.patch

-Patch3:         remove-netstat.patch

-Patch4:         distro-systemctl.patch

-Patch5:         photon-hosts-template.patch

-Patch6:         resizePartitionUUID.patch

+Patch3:         photon-hosts-template.patch

+Patch4:         resizePartitionUUID.patch

+Patch5:         datasource-guestinfo.patch

+Patch6:         systemd-service-changes.patch

 BuildRequires:  python2

 BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

 BuildRequires:  systemd

-BuildRequires:  dbus, python-ipaddr, iproute2, automake

+BuildRequires:  dbus

+BuildRequires:  python-ipaddr

+BuildRequires:  iproute2

+BuildRequires:  automake

+

 Requires:       systemd

+Requires:       net-tools

 Requires:       python2

 Requires:       python2-libs

 Requires:       python-configobj

 Requires:       python-prettytable

 Requires:       python-requests

+Requires:       python-setuptools

 Requires:       PyYAML

 Requires:       python-jsonpatch

+Requires:       python-oauthlib

 Requires:       python-jinja2

+Requires:       python-markupsafe

+Requires:       python-six

+

 BuildArch:      noarch

 %description

@@ -127,7 +137,15 @@ rm -rf $RPM_BUILD_ROOT

 %files

 %license LICENSE

-%{_sysconfdir}/cloud/*

+%doc %{_sysconfdir}/cloud/cloud.cfg.d/README

+%dir %{_sysconfdir}/cloud/templates

+%config(noreplace) %{_sysconfdir}/cloud/templates/*

+%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg.d/05_logging.cfg

+%config(noreplace) %{_sysconfdir}/cloud/cloud.cfg

+%{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager

+%{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient

+/lib/systemd/system-generators/cloud-init-generator

+/lib/udev/rules.d/66-azure-ephemeral.rules

 /lib/systemd/system/*

 %{_docdir}/cloud-init/*

 %{_libdir}/cloud-init/*

@@ -137,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT

 %changelog

+*   Thu Apr 27 2017 Anish Swaminathan <anishs@vmware.com> 0.7.9-1

+-   Upgraded to version 0.7.9

+-   Enabled VmxGuestinfo datasource

 *   Thu Apr 27 2017 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.7.6-17

 -   Fix Arch

 *   Wed Mar 29 2017 Kumar Kaushik <kaushikk@vmware.com>  0.7.6-16

@@ -31,7 +31,8 @@ datasource_list: [

 #                  OpenStack, 

 #                  CloudSigma, 

 #                  Ec2, 

-#                  CloudStack, 

+#                  CloudStack,

+#                  VmxGuestinfo, 

                   None 

                  ]

new file mode 100644

@@ -0,0 +1,143 @@

+diff -rupN cloud-init-0.7.9/cloudinit/sources/DataSourceVmxGuestinfo.py cloud-init-0.7.9-new/cloudinit/sources/DataSourceVmxGuestinfo.py

+--- cloud-init-0.7.9/cloudinit/sources/DataSourceVmxGuestinfo.py    1969-12-31 16:00:00.000000000 -0800

+@@ -0,0 +1,139 @@

++# vi: ts=4 expandtab

++#

++# Copyright (C) 2017 VMware Inc.

++#

++# Author: Anish Swaminathan <anishs@vmware.com>

++#

++import os

++

++from cloudinit import log as logging

++from cloudinit import sources

++from cloudinit import util

++

++from distutils.spawn import find_executable

++

++LOG = logging.getLogger(__name__)

++

++class DataSourceVmxGuestinfo(sources.DataSource):

++    def __init__(self, sys_cfg, distro, paths, ud_proc=None):

++        sources.DataSource.__init__(self, sys_cfg, distro, paths, ud_proc)

++        self.metadata = {}

++        self.userdata_raw = ''

++        self.vmtoolsd = find_executable("vmtoolsd")

++        if not self.vmtoolsd:

++            LOG.error("Failed to find vmtoolsd")

++

++    def get_data(self):

++        if not self.vmtoolsd:

++            LOG.error("vmtoolsd is required to fetch guestinfo value")

++            return False

++        hostname = self._get_guestinfo_value('hostname')

++        if hostname:

++            self.distro.set_hostname(hostname)

++        found = True

++        dev_index = 0

++        network_settings = ''

++        while found:

++            key_begin = 'interface.' + str(dev_index)

++            key_iname = key_begin + '.name'

++            interface_name = self._get_guestinfo_value(key_iname)

++            if interface_name:

++                network_settings += 'auto ' + interface_name + '\n'

++                network_settings += 'iface ' + interface_name

++                key_proto = key_begin + '.dhcp'

++                dhcp_enabled = self._get_guestinfo_value(key_proto)

++                key_address = key_begin + '.address'

++                address = self._get_guestinfo_value(key_address)

++                bootproto = 'dhcp'

++                if dhcp_enabled:

++                    if dhcp_enabled == 'yes':

++                        network_settings += ' dhcp\n'

++                    elif dhcp_enabled == 'no':

++                        network_settings += ' static\n'

++                        bootproto = 'static'

++                    else:

++                        LOG.warning("Invalid value for yes/no parameter for %s, setting to dhcp", key_proto)

++                elif address:

++                    bootproto = 'static'

++                    dhcp_enabled == 'no'

++                    network_settings += ' static\n'

++                else:

++                    dhcp_enabled == 'yes'

++                    network_settings += ' dhcp\n'

++                    LOG.debug("Setting network bootproto to dhcp by default")

++                key_mac = key_begin + '.mac'

++                mac = self._get_guestinfo_value(key_mac)

++                if address:

++                    network_settings += 'address ' + address + '\n'

++                if mac:

++                    network_settings += 'hwaddress ' + mac + '\n'

++                key_netmask = key_begin + '.netmask'

++                netmask = self._get_guestinfo_value(key_netmask)

++                if netmask:

++                    network_settings += 'netmask ' + netmask + '\n'

++                key_dnsserver = 'dns.servers'

++                dnsserver = self._get_guestinfo_value(key_dnsserver)

++                if dnsserver:

++                    network_settings += 'dns-nameservers '

++                    dnsserver = dnsserver.split(',')

++                    for d in dnsserver:

++                        network_settings += d + ' '

++                    network_settings += '\n'

++                key_dnsdomain = 'dns.domains'

++                dnsdomain = self._get_guestinfo_value(key_dnsdomain)

++                if dnsdomain:

++                    network_settings += 'dns-search '

++                    dnsdomain = dnsdomain.split(',')

++                    for d in dnsdomain:

++                        network_settings += d + ' '

++                    network_settings += '\n'

++                route_index = 0

++                default_destination_set = False

++                while True:

++                    key_route = key_begin + '.route.' + str(route_index)

++                    route = self._get_guestinfo_value(key_route)

++                    if route:

++                        network_settings += "routes.%s " % (route_index)

++                        route = route.split(',')

++                        if len(route) > 2:

++                            LOG.debug("Route information for %s route in %s device incorrect - ", 

++                                                "expected 2 values", route_index, dev_index)

++                            continue

++                        elif len(route) == 2:

++                            network_settings += route[0] + ' ' + route[1] + '\n'# Gateway Destination

++                        else: #length = 1

++                            if not default_destination_set:

++                                network_settings += route[0] + ' 0.0.0.0/0' + '\n'

++                                default_destination_set = True

++                            else:

++                                LOG.debug("Default destination set previously, not setting route %s", route_index) 

++                    else:

++                        break

++                    route_index += 1

++            else:

++                found = False

++            dev_index += 1

++        self.distro.apply_network(network_settings)

++

++    def _get_guestinfo_value(self, key):

++        LOG.debug("Getting guestinfo value for key %s", key)

++        value = ''

++        try:

++            (value, _err) = util.subp([self.vmtoolsd, "--cmd", "info-get guestinfo." + key])

++            if _err:

++                LOG.error("Failed to get guestinfo value for key %s", key)

++        except util.ProcessExecutionError as error:

++            util.logexc(LOG,"Failed to get guestinfo value for key %s: %s", key, error)

++        except Exception:

++            util.logexc(LOG,"Unexpected error while trying to get guestinfo value for key %s", key)

++        return value.rstrip()

++

++    def get_instance_id(self):

++        with open('/sys/class/dmi/id/product_uuid', 'r') as id_file:

++            return str(f.read()).rstrip()

++

++def get_datasource_list(depends):

++    """

++    Return a list of data sources that match this set of dependencies

++    """

++    return [DataSourceVmxGuestinfo]

deleted file mode 100644

@@ -1,11 +0,0 @@

-diff -rupr a/cloudinit/distros/photon.py b/cloudinit/distros/photon.py

-+++ b/cloudinit/distros/photon.py	2016-12-13 18:39:03.396187698 -0800

-@@ -20,6 +20,7 @@ class Distro(distros.Distro):

-     hostname_conf_fn = "/etc/hostname"

-     locale_conf_fn = "/etc/default/locale"

-     network_conf_fn = "/etc/network/interfaces"

-+    init_cmd = ['systemctl']  # init scripts

- 

-     def __init__(self, name, cfg, paths):

-         distros.Distro.__init__(self, name, cfg, paths)

@@ -1,9 +1,10 @@

 === added file './cloudinit/distros/photon.py'

 --- ./cloudinit/distros/photon.py	1970-01-01 00:00:00 +0000

-+++ ./cloudinit/distros/photon.py	2015-03-06 01:28:00 +0000

-@@ -0,0 +1,134 @@

+@@ -0,0 +1,299 @@

 +# vi: ts=4 expandtab

 +#

++# Copyright (C) 2017 VMware Inc.

 +#    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

 +#

 +

@@ -13,7 +14,7 @@

 +from cloudinit import helpers

 +from cloudinit import log as logging

 +from cloudinit import util

-+

++from cloudinit.distros import net_util

 +from cloudinit.distros.parsers.hostname import HostnameConf

 +

 +from cloudinit.settings import PER_INSTANCE

@@ -23,7 +24,9 @@

 +class Distro(distros.Distro):

 +    hostname_conf_fn = "/etc/hostname"

 +    locale_conf_fn = "/etc/default/locale"

-+    network_conf_fn = "/etc/network/interfaces"

++    network_conf_dir = "/etc/systemd/network/"

++    resolve_conf_fn = "/etc/resolv.conf"

++    init_cmd = ['systemctl']  # init scripts

 +

 +    def __init__(self, name, cfg, paths):

 +        distros.Distro.__init__(self, name, cfg, paths)

@@ -51,18 +54,113 @@

 +        self.package_command('install', pkgs=pkglist)

 +

 +    def _write_network(self, settings):

-+        util.write_file(self.network_conf_fn, settings)

-+        return ['all']

++        entries = net_util.translate_network(settings)

++        LOG.debug("Translated ubuntu style network settings %s into %s",

++                  settings, entries)

++        route_entries = []

++        route_entries = translate_routes(settings)

++        dev_names = entries.keys()

++        dev_index = 10;

++        nameservers = []

++        searchdomains = []

++        # Format for systemd

++        for (dev, info) in entries.items():

++            if dev == 'lo':

++                continue

++            net_fn = self.network_conf_dir + str(dev_index) + '-' + dev + '.network'

++            dhcp_enabled = 'no'

++            if info.get('bootproto') == 'dhcp':

++                dhcp_enabled = 'yes'        

++            net_cfg = {

++                'Name': dev,

++                'DHCP': dhcp_enabled,

++            }

++            if info.get('hwaddress'):

++                net_cfg['MACAddress'] = info.get('hwaddress')

++            if info.get('address'):

++                net_cfg['Address'] = "%s" % (info.get('address'))

++                if info.get('netmask'):

++                    net_cfg['Address'] += "/%s" % (info.get('netmask'))

++            if info.get('gateway'):

++                net_cfg['Gateway'] = info.get('gateway')

++            if info.get('dns-nameservers'):

++                net_cfg['DNS'] = str(tuple(info.get('dns-nameservers'))).replace(',', '')

++            if info.get('dns-search'):

++                net_cfg['Domains'] = str(tuple(info.get('dns-search'))).replace(',', '')

++            route_entry = []

++            if dev in route_entries:

++                route_entry = route_entries[dev]

++                route_index = 0

++                found = True

++                while found:

++                    route_name = 'routes.' + str(route_index)

++                    if route_name in route_entries[dev]:

++                        val = str(tuple(route_entries[dev][route_name])).replace(',', '')

++                        if val:

++                            net_cfg[route_name] = val

++                    else:

++                        found = False

++                    route_index += 1

 +

-+    def _bring_up_interfaces(self, device_names):

-+        use_all = False

-+        for d in device_names:

-+            if d == 'all':

-+                use_all = True

-+        if use_all:

-+            return distros.Distro._bring_up_interface(self, '--all')

++            if info.get('auto'):

++                self._write_interface_file(net_fn, net_cfg, route_entry)

++            if 'dns-nameservers' in info:

++                nameservers.extend(info['dns-nameservers'])

++            if 'dns-search' in info:

++                searchdomains.extend(info['dns-search'])

++            dev_index = dev_index + 1;

++

++        if nameservers or searchdomains:

++            util.write_file(self.resolve_conf_fn,

++                            convert_resolv_conf(nameservers, searchdomains))

++

++        return dev_names

++

++    def _write_interface_file(self, net_fn, net_cfg, route_entry):

++        if not net_cfg['Name']:

++            return

++        content = "[Match]\n"

++        content += "Name=%s\n" % (net_cfg['Name'])

++        if 'MACAddress' in net_cfg:

++            content += "MACAddress=%s\n" % (net_cfg['MACAddress'])

++        content += "[Network]\n"

++        if 'DHCP' in net_cfg and net_cfg['DHCP'] == 'yes':

++            content += "DHCP=%s\n" % (net_cfg['DHCP'])

 +        else:

-+            return distros.Distro._bring_up_interfaces(self, device_names)

++            if 'Address' in net_cfg:

++                content += "Address=%s\n" % (net_cfg['Address'])

++            if 'Gateway' in net_cfg:

++                content += "Gateway=%s\n" % (net_cfg['Gateway'])

++            route_index = 0

++            found = True

++            if route_entry:

++                while found:

++                    route_name = 'routes.' + str(route_index)

++                    if route_name in route_entry:

++                        content += "[Route]\n"

++                        if len(route_entry[route_name]) != 2:

++                            continue

++                        content += "Gateway=%s\n" % (route_entry[route_name][0])

++                        content += "Destination=%s\n" % (route_entry[route_name][1])

++                    else:

++                        found = False

++                    route_index += 1

++

++        util.write_file(net_fn, content)

++

++

++    def _bring_up_interfaces(self, device_names):

++        cmd = ['systemctl', 'restart', 'systemd-networkd', 'systemd-resolved']

++        LOG.debug("Attempting to run bring up interfaces using command %s",

++                  cmd)

++        try:

++            (_out, err) = util.subp(cmd)

++            if len(err):

++                LOG.warn("Running %s resulted in stderr output: %s", cmd, err)

++            return True

++        except util.ProcessExecutionError:

++            util.logexc(LOG, "Running network bringup command %s failed", cmd)

++            return False

 +

 +    def _select_hostname(self, hostname, fqdn):

 +        # Prefer the short hostname over the long

@@ -136,4 +234,70 @@

 +        self._runner.run("update-sources", self.package_command,

 +                         ["makecache"], freq=PER_INSTANCE)

 +

-

++def convert_resolv_conf(nameservers, searchdomains):

++    """Returns a string formatted for resolv.conf."""

++    result = ''

++    if isinstance(nameservers, list):

++        for ns in nameservers:

++            result = result + 'nameserver %s\n' % ns

++    if isinstance(searchdomains, list):

++        for sd in searchdomains:

++            result = result + 'search %s\n' % sd

++    return result

++

++def translate_routes(settings):

++    entries = []

++    for line in settings.splitlines():

++        line = line.strip()

++        if not line or line.startswith("#"):

++            continue

++        split_up = line.split(None, 1)

++        if len(split_up) <= 1:

++            continue

++        entries.append(split_up)

++    consume = {}

++    ifaces = []

++    for (cmd, args) in entries:

++        if cmd == 'iface':

++            if consume:

++                ifaces.append(consume)

++                consume = {}

++            consume[cmd] = args

++        else:

++            consume[cmd] = args

++

++    absorb = False

++    for (cmd, args) in consume.items():

++        if cmd == 'iface':

++            absorb = True

++    if absorb:

++        ifaces.append(consume)

++    out_ifaces = {}

++    for info in ifaces:

++        if 'iface' not in info:

++            continue

++        iface_details = info['iface'].split(None)

++        dev_name = None

++        if len(iface_details) >= 1:

++            dev = iface_details[0].strip().lower()

++            if dev:

++                dev_name = dev

++        if not dev_name:

++            continue

++        route_info = {}

++        route_index = 0

++        found = True

++        while found:

++            route_name = 'routes.' + str(route_index)

++            if route_name in info:

++                val = info[route_name].split()

++                if val:

++                    route_info[route_name] = val

++            else:

++                found = False

++            route_index += 1

++        if dev_name in out_ifaces:

++            out_ifaces[dev_name].update(route_info)

++        else:

++            out_ifaces[dev_name] = route_info

++    return out_ifaces

deleted file mode 100644

@@ -1,114 +0,0 @@

-diff -ru cloud-init-0.7.6/cloudinit/netinfo.py cloud-init-0.7.6-modify/cloudinit/netinfo.py

-+++ cloud-init-0.7.6-modify/cloudinit/netinfo.py	2015-09-17 15:05:41.299270875 -0700

-@@ -93,49 +93,50 @@

- 

-     return devs

- 

--

- def route_info():

--    (route_out, _err) = util.subp(["netstat", "-rn"])

-+    (route_out, _err) = util.subp(["ip", "route"])

-     routes = []

--    entries = route_out.splitlines()[1:]

-+    entries = route_out.splitlines()

-     for line in entries:

-         if not line:

-             continue

-         toks = line.split()

--

--        # FreeBSD shows 6 items in the routing table:

--        #  Destination  Gateway    Flags Refs    Use  Netif Expire

--        #  default      10.65.0.1  UGS      0  34920 vtnet0

--        #

--        # Linux netstat shows 2 more:

--        #  Destination  Gateway    Genmask  Flags MSS Window irtt Iface

--        #  0.0.0.0      10.65.0.1  0.0.0.0  UG      0 0         0 eth0

--        if (len(toks) < 6 or toks[0] == "Kernel" or

--                toks[0] == "Destination" or toks[0] == "Internet" or

--                toks[0] == "Internet6" or toks[0] == "Routing"):

--            continue

--

--        if len(toks) < 8:

--            toks.append("-")

--            toks.append("-")

--            toks[7] = toks[5]

--            toks[5] = "-"

-+        dest = toks[0].split('/')

-+        listlen = len(dest)

-+        if listlen == 1:

-+            subnet = "32"

-+        else:

-+            subnet = dest[1]

-+        if toks[0] == "default":

-+            gat = toks[2]

-+            mask = "0.0.0.0"

-+            dest[0] = "0.0.0.0"

-+            dev = toks[4]

-+            df = "yes"

-+        else:

-+            gat = "0.0.0.0"

-+            dev = toks[2]

-+            df = "no"

-+

-+            if subnet == "32":

-+                mask = "255.255.255.255"

-+            if subnet == "24":

-+                mask = "255.255.255.0"

-+            if subnet == "16":

-+                mask = "255.255.0.0"

-+            if subnet == "8":

-+                mask = "255.0.0.0"

- 

-         entry = {

--            'destination': toks[0],

--            'gateway': toks[1],

--            'genmask': toks[2],

--            'flags': toks[3],

--            'metric': toks[4],

--            'ref': toks[5],

--            'use': toks[6],

--            'iface': toks[7],

-+            'destination': dest[0],

-+            'gateway': gat,

-+            'genmask': mask,

-+            'iface': dev,

-+            'DefGateway': df,

-         }

--

-         routes.append(entry)

-     return routes

- 

--

- def getgateway():

-     routes = []

-     try:

-@@ -143,11 +144,10 @@

-     except:

-         pass

-     for r in routes:

--        if r['flags'].find("G") >= 0:

-+        if r['DefGateway'] == "yes":

-             return "%s[%s]" % (r['gateway'], r['iface'])

-     return None

- 

--

- def netdev_pformat():

-     lines = []

-     try:

-@@ -177,13 +177,13 @@

-         routes = None

-     if routes is not None:

-         fields = ['Route', 'Destination', 'Gateway',

--                  'Genmask', 'Interface', 'Flags']

-+                  'Genmask', 'Interface', 'IsDefaultGateway']

-         tbl = PrettyTable(fields)

-         for (n, r) in enumerate(routes):

-             route_id = str(n)

-             tbl.add_row([route_id, r['destination'],

-                         r['gateway'], r['genmask'],

--                        r['iface'], r['flags']])

-+                        r['iface'], r['DefGateway']])

-         route_s = tbl.get_string()

-         max_len = len(max(route_s.splitlines(), key=len))

-         header = util.center("Route info", "+", max_len)

@@ -1,24 +1,102 @@

-diff -ru cloud-init-0.7.6/cloudinit/config/cc_growpart.py cloud-init-0.7.6-modified/cloudinit/config/cc_growpart.py

-+++ cloud-init-0.7.6-modified/cloudinit/config/cc_growpart.py	2017-03-29 17:12:40.059392874 -0700

-@@ -276,7 +276,7 @@

-             log.debug("use ignore_growroot_disabled to ignore")

-             return

+diff -rup cloud-init-0.7.9/cloudinit/config/cc_growpart.py cloud-init-0.7.9-new/cloudinit/config/cc_growpart.py

+--- cloud-init-0.7.9/cloudinit/config/cc_growpart.py	2016-12-23 08:37:45.000000000 -0800

+@@ -247,7 +247,20 @@ def devent2dev(devent):

+         result = util.get_mount_info(devent)

+         if not result:

+             raise ValueError("Could not determine device of '%s' % dev_ent")

+-        return result[0]

++        dev = result[0]

++

++    container = util.is_container()

++

++    # Ensure the path is a block device.

++    if (dev == "/dev/root" and not container):

++        dev = util.rootdev_from_cmdline(util.get_cmdline())

++        if dev is None:

++            if os.path.exists(dev):

++                # if /dev/root exists, but we failed to convert

++                # that to a "real" /dev/ path device, then return it.

++                return dev

++            raise ValueError("Unable to find device '/dev/root'")

++    return dev

--    devices = util.get_cfg_option_list(cfg, "devices", ["/"])

-+    devices = util.get_cfg_option_list(mycfg, "devices", ["/"])

-     if not len(devices):

-         log.debug("growpart: empty device list")

-         return

-diff -ru cloud-init-0.7.6/cloudinit/config/cc_resizefs.py cloud-init-0.7.6-modified/cloudinit/config/cc_resizefs.py

-+++ cloud-init-0.7.6-modified/cloudinit/config/cc_resizefs.py	2017-03-29 17:00:59.965405389 -0700

-@@ -71,6 +71,8 @@

-         return "/dev/disk/by-label/" + found[len("LABEL="):]

-     if found.startswith("UUID="):

-         return "/dev/disk/by-uuid/" + found[len("UUID="):]

-+    if found.startswith("PARTUUID="):

-+        return "/dev/disk/by-partuuid/" + found[len("PARTUUID="):]

-     return "/dev/" + found

+ def resize_devices(resizer, devices):

+diff -rup cloud-init-0.7.9/cloudinit/config/cc_resizefs.py cloud-init-0.7.9-new/cloudinit/config/cc_resizefs.py

+--- cloud-init-0.7.9/cloudinit/config/cc_resizefs.py	2016-12-23 08:37:45.000000000 -0800

+@@ -71,25 +71,6 @@ RESIZE_FS_PREFIXES_CMDS = [

+ NOBLOCK = "noblock"

+ 

+-def rootdev_from_cmdline(cmdline):

+-    found = None

+-    for tok in cmdline.split():

+-        if tok.startswith("root="):

+-            found = tok[5:]

+-            break

+-    if found is None:

+-        return None

+-

+-    if found.startswith("/dev/"):

+-        return found

+-    if found.startswith("LABEL="):

+-        return "/dev/disk/by-label/" + found[len("LABEL="):]

+-    if found.startswith("UUID="):

+-        return "/dev/disk/by-uuid/" + found[len("UUID="):]

+-

+-    return "/dev/" + found

+-

+-

+ def handle(name, cfg, _cloud, log, args):

+     if len(args) != 0:

+         resize_root = args[0]

+@@ -121,7 +102,7 @@ def handle(name, cfg, _cloud, log, args)

+     # Ensure the path is a block device.

+     if (devpth == "/dev/root" and not os.path.exists(devpth) and

+             not container):

+-        devpth = rootdev_from_cmdline(util.get_cmdline())

++        devpth = util.rootdev_from_cmdline(util.get_cmdline())

+         if devpth is None:

+             log.warn("Unable to find device '/dev/root'")

+             return

+diff -rup cloud-init-0.7.9/cloudinit/util.py cloud-init-0.7.9-new/cloudinit/util.py

+--- cloud-init-0.7.9/cloudinit/util.py	2016-12-23 08:37:45.000000000 -0800

+@@ -2402,4 +2402,34 @@ def system_is_snappy():

+         return True

+     return False

+ 

++def rootdev_from_cmdline(cmdline):

++    found = None

++    for tok in cmdline.split():

++        if tok.startswith("root="):

++            found = tok[5:]

++            break

++    if found is None:

++        return None

++

++    if found.startswith("/dev/"):

++        return found

++    if found.startswith("LABEL="):

++        return "/dev/disk/by-label/" + found[len("LABEL="):]

++    if found.startswith("UUID="):

++        return "/dev/disk/by-uuid/" + found[len("UUID="):].lower()

++    if found.startswith("PARTUUID="):

++        disks_path = ("/dev/disk/by-partuuid/" +

++                      found[len("PARTUUID="):].lower())

++        if os.path.exists(disks_path):

++            return disks_path

++        results = find_devs_with(found)

++        if results:

++            return results[0]

++        # we know this doesn't exist, but for consistency return the path as

++        # it /would/ exist

++        return disks_path

++

++    return "/dev/" + found

++

++

+ # vi: ts=4 expandtab

+

new file mode 100644

@@ -0,0 +1,31 @@

+diff -rup cloud-init-0.7.9/systemd/cloud-final.service cloud-init-0.7.9-new/systemd/cloud-final.service

+--- cloud-init-0.7.9/systemd/cloud-final.service	2016-12-23 08:37:45.000000000 -0800

+@@ -1,6 +1,6 @@

+ [Unit]

+ Description=Execute cloud user/final scripts

+-After=network-online.target cloud-config.service rc-local.service multi-user.target

++After=network-online.target cloud-config.service rc-local.service

+ Wants=network-online.target cloud-config.service

+ 

+ [Service]

+diff -rup cloud-init-0.7.9/systemd/cloud-init.service cloud-init-0.7.9-new/systemd/cloud-init.service

+--- cloud-init-0.7.9/systemd/cloud-init.service	2016-12-23 08:37:45.000000000 -0800

+@@ -1,6 +1,5 @@

+ [Unit]

+ Description=Initial cloud-init job (metadata service crawler)

+-DefaultDependencies=no

+ Wants=cloud-init-local.service

+ Wants=sshd-keygen.service

+ Wants=sshd.service

+@@ -9,9 +8,7 @@ After=networking.service

+ Before=network-online.target

+ Before=sshd-keygen.service

+ Before=sshd.service

+-Before=sysinit.target

+ Before=systemd-user-sessions.service

+-Conflicts=shutdown.target

+ 

+ [Service]

+ Type=oneshot

@@ -1,9 +1,9 @@

-diff -ru cloud-init-0.7.6/cloudinit/distros/__init__.py cloud-init-0.7-modified/cloudinit/distros/__init__.py

-+++ cloud-init-0.7-modified/cloudinit/distros/__init__.py	2015-08-11 14:22:09.814582603 +0000

-@@ -376,6 +376,9 @@

-         if 'plain_text_passwd' in kwargs and kwargs['plain_text_passwd']:

-             self.set_passwd(name, kwargs['plain_text_passwd'])

+diff -rup cloud-init-0.7.9/cloudinit/distros/__init__.py cloud-init-0.7.9-new/cloudinit/distros/__init__.py

+--- cloud-init-0.7.9/cloudinit/distros/__init__.py	2016-12-23 08:37:45.000000000 -0800

+@@ -488,6 +488,9 @@ class Distro(object):

+         if 'hashed_passwd' in kwargs and kwargs['hashed_passwd']:

+             self.set_passwd(name, kwargs['hashed_passwd'], hashed=True)

 +        if 'passwd' in kwargs and kwargs['passwd']:

 +            self.set_passwd(name,kwargs['passwd'],True)

@@ -1,7 +1,7 @@

 Summary:	cpio-2.12

 Name:		cpio

 Version:	2.12

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv3+

 URL:		http://www.gnu.org/software/cpio/

 Group:		System Environment/System utilities

@@ -11,6 +11,14 @@ Source0:	http://ftp.gnu.org/pub/gnu/cpio/%{name}-%{version}.tar.bz2

 %define sha1 cpio=60358408c76db354f6716724c4bcbcb6e18ab642

 %description

 The cpio package contains tools for archiving.

+

+%package lang

+Summary: Additional language files for cpio

+Group:   System Environment/System utilities

+Requires: %{name} = %{version}-%{release}

+%description lang

+These are the additional language files of cpio

+

 %prep

 %setup -q

 %build

@@ -30,6 +38,7 @@ install -v -m755 -d %{buildroot}/%{_docdir}/%{name}-%{version}/html

 install -v -m644    doc/html/* %{buildroot}/%{_docdir}/%{name}-%{version}/html

 install -v -m644    doc/cpio.{html,txt} %{buildroot}/%{_docdir}/%{name}-%{version}

 rm -rf %{buildroot}%{_infodir}

+%find_lang %{name}

 %check

 make %{?_smp_mflags} check

@@ -37,10 +46,15 @@ make %{?_smp_mflags} check

 %files

 %defattr(-,root,root)

 %{_bindir}/*

-%{_datarootdir}/locale/*

 %{_mandir}/man1/*

 %{_docdir}/%{name}-%{version}/*

+

+%files lang -f %{name}.lang

+%defattr(-,root,root)

+

 %changelog

+*       Tue May 02 2017 Anish Swaminathan <anishs@vmware.com> 2.12-3

+-       Add lang package

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.12-2

 -	GA - Bump release of all rpms

 * 	Thu Jan 14 2016 Xiaolin Li <xiaolinl@vmware.com> 2.12-1

@@ -1,7 +1,7 @@

 Summary:        Contains the utilities for the ext2 file system

 Name:           e2fsprogs

 Version:        1.43.4

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        GPLv2+

 URL:            http://e2fsprogs.sourceforge.net

 Group:          System Environment/Base

@@ -24,10 +24,19 @@ Summary:    Header and development files for e2fsprogs

 Requires:   %{name} = %{version}

 %description    devel

 It contains the libraries and header files to create applications 

+

+%package lang

+Summary: Additional language files for e2fsprogs

+Group:   System Environment/Base

+Requires: %{name} = %{version}-%{release}

+%description lang

+These are the additional language files of e2fsprogs

+

 %prep