@@ -1,22 +1,25 @@

 Name:           WALinuxAgent

 Summary:        The Windows Azure Linux Agent

-Version:        2.0.18

-Release:        4%{?dist}

+Version:        2.2.14

+Release:        1%{?dist}

 License:        Apache License Version 2.0

 Group:          System/Daemons

-Url:            http://go.microsoft.com/fwlink/?LinkId=250998

+Url:            https://github.com/Azure/WALinuxAgent

 Source0:        %{name}-%{version}.tar.gz

 Patch0:         photondistroadd.patch

-%define sha1 WALinuxAgent=76238745a0ec598920f37a6445e383dab23c9f1b

+%define sha1 WALinuxAgent=f417009479ea7168ee0f2daa38328c167b4f874b

 Vendor:		VMware, Inc.

 Distribution:	Photon

 BuildRequires:  python2

 BuildRequires:  python2-libs

 BuildRequires:  python-setuptools

+BuildRequires:  python-xml

 BuildRequires:  systemd

+

 Requires:       python2

 Requires:       python2-libs

+Requires:       python-xml

 Requires:       python-pyasn1

 Requires:       openssh

 Requires:       openssl

@@ -36,18 +39,16 @@ VMs in the Windows Azure cloud. This package should be installed on Linux disk

 images that are built to run in the Windows Azure environment.

 %prep

-%setup -q

-find . -type f -exec sed -i 's/\r//' {} +

-find . -type f -exec chmod 0644 {} +

-%patch -P 0 -p1

+%setup -q -n WALinuxAgent-2.2.14

+%patch0 -p1

 %pre -p /bin/sh

 %build

-python2 setup.py build

+python2 setup.py build -b py2

 %install

-python2 setup.py install --prefix=%{_prefix} --lnx-distro='photon' --init-system='systemd' --root=%{buildroot}

+python2 -tt setup.py build -b py2 install --prefix=%{_prefix} --lnx-distro='photonos' --root=%{buildroot} --force

 mkdir -p  %{buildroot}/%{_localstatedir}/log

 mkdir -p -m 0700 %{buildroot}/%{_sharedstatedir}/waagent

 touch %{buildroot}/%{_localstatedir}/log/waagent.log

@@ -67,17 +68,18 @@ python2 setup.py check && python2 setup.py test

 %files

 /usr/lib/systemd/system/*

-%attr(0755,root,root) %{_sysconfdir}/udev/rules.d/99-azure-product-uuid.rules

 %defattr(0644,root,root,0755)

-%doc Changelog LICENSE-2.0.txt NOTICE README

-%attr(0755,root,root) %{_sbindir}/waagent

-%config(noreplace) %{_sysconfdir}/logrotate.d/waagent

+%doc Changelog

+%attr(0755,root,root) %{_bindir}/waagent

+%attr(0755,root,root) %{_bindir}/waagent2.0

 %config %{_sysconfdir}/waagent.conf

 %ghost %{_localstatedir}/log/waagent.log

 %dir %attr(0700, root, root) %{_sharedstatedir}/waagent

-

+/usr/lib/python2.7/site-packages/*

 %changelog

+* Thu Jul 13 2017 Anish Swaminathan <anishs@vmware.com> 2.2.14-1

+- Update to 2.2.14

 * Thu Jun 01 2017 Dheeraj Shetty <dheerajs@vmware.com> 2.0.18-4

 - Use python2 explicitly to build

 * Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 2.0.18-3

@@ -91,4 +93,4 @@ python2 setup.py check && python2 setup.py test

 * Thu Aug 6 2015 Anish Swaminathan <anishs@vmware.com>

 - Added sha1sum

 * Fri Mar 13 2015 - mbassiouny@vmware.com

-- Initial pacaking for Discus

+- Initial packaging

@@ -1,151 +1,247 @@

-diff -ru WALinuxAgent-2.0.18/waagent WALinuxAgent-2.0.18-new/waagent

-+++ WALinuxAgent-2.0.18-new/waagent	2016-04-29 01:03:04.294204270 -0700

-@@ -2403,6 +2403,139 @@

-         Run('/sbin/usermod ' + user + ' -G ""')

-         super(fedoraDistro, self).DeleteAccount(user)

- 

-+

-+############################################################    

-+# photonDistro

-+############################################################    

-+

-+class photonDistro(AbstractDistro):

-+    """

-+    photon Distro concrete class

-+    Put photon specific behavior here...

-+    """

-+    CORE_UID = 500

-+

+diff -rupN WALinuxAgent-2.2.14-old/azurelinuxagent/common/osutil/factory.py WALinuxAgent-2.2.14/azurelinuxagent/common/osutil/factory.py

+--- WALinuxAgent-2.2.14-old/azurelinuxagent/common/osutil/factory.py	2017-06-22 16:00:39.000000000 -0700

+@@ -21,6 +21,7 @@ from azurelinuxagent.common.version impo

+ from .default import DefaultOSUtil

+ from .arch import ArchUtil

+ from .clearlinux import ClearLinuxUtil

++from .photonos import PhotonOSUtil

+ from .coreos import CoreOSUtil

+ from .debian import DebianOSUtil

+ from .freebsd import FreeBSDOSUtil

+@@ -44,6 +45,9 @@ def get_osutil(distro_name=DISTRO_NAME,

+     if distro_name == "clear linux software for intel architecture":

+         return ClearLinuxUtil()

+

++    if distro_name == "photonos":

++        return PhotonOSUtil()

++

+     if distro_name == "ubuntu":

+         if Version(distro_version) == Version("12.04") or Version(distro_version) == Version("12.10"):

+             return Ubuntu12OSUtil()

+diff -rupN WALinuxAgent-2.2.14-old/azurelinuxagent/common/osutil/photonos.py WALinuxAgent-2.2.14/azurelinuxagent/common/osutil/photonos.py

+--- WALinuxAgent-2.2.14-old/azurelinuxagent/common/osutil/photonos.py	1969-12-31 16:00:00.000000000 -0800

+@@ -0,0 +1,88 @@

++#

++# Copyright 2017 Microsoft Corporation

++#

++# Licensed under the Apache License, Version 2.0 (the "License");

++# you may not use this file except in compliance with the License.

++# You may obtain a copy of the License at

++#

++#     http://www.apache.org/licenses/LICENSE-2.0

++#

++# Unless required by applicable law or agreed to in writing, software

++# distributed under the License is distributed on an "AS IS" BASIS,

++# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

++# See the License for the specific language governing permissions and

++# limitations under the License.

++#

++# Requires Python 2.4+ and Openssl 1.0+

++#

++

++import os

++import re

++import pwd

++import shutil

++import socket

++import array

++import struct

++import fcntl

++import time

++import base64

++import azurelinuxagent.common.conf as conf

++import azurelinuxagent.common.logger as logger

++import azurelinuxagent.common.utils.fileutil as fileutil

++import azurelinuxagent.common.utils.shellutil as shellutil

++import azurelinuxagent.common.utils.textutil as textutil

++from azurelinuxagent.common.osutil.default import DefaultOSUtil

++

++class PhotonOSUtil(DefaultOSUtil):

 +    def __init__(self):

-+        super(photonDistro,self).__init__()

-+        self.requiredDeps += [ "/bin/systemctl" ]

-+        self.agent_service_name = 'waagent'

-+        self.init_script_file='/usr/lib/systemd/system/waagent.service'

-+        self.dhcp_client_name='systemd-networkd'

-+        self.getpidcmd='pidof '

-+        self.shadow_file_mode=0640

-+        self.dhcp_enabled=True

-+

-+    def checkPackageInstalled(self,p):

-+        """

-+        There is no package manager in Photon.  Return 1 since it must be preinstalled.

-+        """

-+        return 1

-+

-+    def checkDependencies(self):

-+        for a in self.requiredDeps:

-+            if Run("which " + a + " > /dev/null 2>&1",chk_err=False):

-+                Error("Missing required dependency: " + a)

-+                return 1

-+        return 0

-+

-+

-+    def checkPackageUpdateable(self,p):

-+        """

-+        There is no package manager in Photon.  Return 0 since it can't be updated via package.

-+        """

-+        return 0

-+

-+    def startAgentService(self):

-+        return Run('systemctl start ' + self.agent_service_name)

-+

-+    def stopAgentService(self):

-+        return Run('systemctl stop ' + self.agent_service_name)

-+

-+    def restartSshService(self):

-+        return Run('systemctl restart sshd')

-+

-+    def sshDeployPublicKey(self,fprint,path):

-+        """

-+        We support PKCS8.

-+        """

-+        if Run("ssh-keygen -i -m PKCS8 -f " + fprint + " >> " + path):

-+            return 1

-+        else :

-+            return 0

-+

-+    def RestartInterface(self, iface):

-+        Run("systemctl restart systemd-networkd")

-+

-+    def CreateAccount(self, user, password, expiration, thumbprint):

-+        """

-+        Create a user account, with 'user', 'password', 'expiration', ssh keys

-+        and sudo permissions.

-+        Returns None if successful, error string on failure.

-+        """

-+        userentry = None

-+        try:

-+            userentry = pwd.getpwnam(user)

-+        except:

-+            pass

-+        uidmin = None

-+        try:

-+            uidmin = int(GetLineStartingWith("UID_MIN", "/etc/login.defs").split()[1])

-+        except:

-+            pass

-+        if uidmin == None:

-+            uidmin = 100

-+        if userentry != None and userentry[2] < uidmin and userentry[2] != self.CORE_UID:

-+            Error("CreateAccount: " + user + " is a system user. Will not set password.")

-+            return "Failed to set password for system user: " + user + " (0x06)."

-+        if userentry == None:

-+            command = "useradd --create-home --password '*' " + user

-+            if expiration != None:

-+                command += " --expiredate " + expiration.split('.')[0]

-+            if Run(command):

-+                Error("Failed to create user account: " + user)

-+                return "Failed to create user account: " + user + " (0x07)."

-+        else:

-+            Log("CreateAccount: " + user + " already exists. Will update password.")

-+        if password != None:

-+            RunSendStdin("chpasswd", user + ":" + password + "\n")

++        super(PhotonOSUtil, self).__init__()

++        self.agent_conf_file_path = '/etc/waagent.conf'

++

++    def is_dhcp_enabled(self):

++        return True

++

++    def start_network(self) :

++        return shellutil.run("systemctl start systemd-networkd", chk_err=False)

++

++    def restart_if(self, iface):

++        shellutil.run("systemctl restart systemd-networkd")

++

++    def restart_ssh_service(self):

++        shellutil.run("systemctl restart sshd")

++

++    def stop_dhcp_service(self):

++        return shellutil.run("systemctl stop systemd-networkd", chk_err=False)

++

++    def start_dhcp_service(self):

++        return shellutil.run("systemctl start systemd-networkd", chk_err=False)

++

++    def start_agent_service(self):

++        return shellutil.run("systemctl start waagent", chk_err=False)

++

++    def stop_agent_service(self):

++        return shellutil.run("systemctl stop waagent", chk_err=False)

++

++    def get_dhcp_pid(self):

++        ret= shellutil.run_get_output("pidof systemd-networkd")

++        return ret[1] if ret[0] == 0 else None

++

++    def conf_sshd(self, disable_password):

++        pass

++

++    def del_root_password(self):

 +        try:

-+            if password == None:

-+                SetFileContents("/etc/sudoers.d/waagent", user + " ALL = (ALL) NOPASSWD: ALL\n")

++            passwd_file_path = conf.get_passwd_file_path()

++            try:

++                passwd_content = fileutil.read_file(passwd_file_path)

++                if not passwd_content:

++                    raise FileNotFoundError

++            except FileNotFoundError:

++                new_passwd = ["root:*LOCK*:14600::::::"]

 +            else:

-+                SetFileContents("/etc/sudoers.d/waagent", user + " ALL = (ALL) ALL\n")

-+            os.chmod("/etc/sudoers.d/waagent", 0440)

-+        except:

-+            Error("CreateAccount: Failed to configure sudo access for user.")

-+            return "Failed to configure sudo privileges (0x08)."

-+        home = MyDistro.GetHome()

-+        if thumbprint != None:

-+            dir = home + "/" + user + "/.ssh"

-+            CreateDir(dir, user, 0700)

-+            pub = dir + "/id_rsa.pub"

-+            prv = dir + "/id_rsa"

-+            Run("ssh-keygen -y -f " + thumbprint + ".prv > " + pub)

-+            SetFileContents(prv, GetFileContents(thumbprint + ".prv"))

-+            for f in [pub, prv]:

-+                os.chmod(f, 0600)

-+                ChangeOwner(f, user)

-+            SetFileContents(dir + "/authorized_keys", GetFileContents(pub))

-+            ChangeOwner(dir + "/authorized_keys", user)

-+        Log("Created user account: " + user)

-+        return None

-+

-+    def startDHCP(self):

-+        Run("systemctl start " + self.dhcp_client_name, chk_err=False)

-+

-+    def stopDHCP(self):

-+        Run("systemctl stop " + self.dhcp_client_name, chk_err=False)

-+

-+    def translateCustomData(self, data):

-+        return base64.b64decode(data)

-+

-+    def getConfigurationPath(self):

-+        return "/etc/waagent.conf"

-+

-+

- ############################################################    

- #	FreeBSD

- ############################################################    

-@@ -6934,6 +7067,7 @@

-     Return MyDistro object.

-     NOTE: Logging is not initialized at this point.

-     """

-+    dist_class_name = 'photonDistro'

-     if dist_class_name == '':

-         if 'Linux' in platform.system():

-             Distro=DistInfo()[0]

++                passwd = passwd_content.split('\n')

++                new_passwd = [x for x in passwd if not x.startswith("root:")]

++                new_passwd.insert(0, "root:*LOCK*:14600::::::")

++            fileutil.write_file(passwd_file_path, "\n".join(new_passwd))

++        except IOError as e:

++            raise OSUtilError("Failed to delete root password:{0}".format(e))

++        pass

+diff -rupN WALinuxAgent-2.2.14-old/azurelinuxagent/common/version.py WALinuxAgent-2.2.14/azurelinuxagent/common/version.py

+--- WALinuxAgent-2.2.14-old/azurelinuxagent/common/version.py	2017-06-22 16:00:39.000000000 -0700

+@@ -98,6 +98,9 @@ def get_distro():

+     if os.path.exists("/etc/euleros-release"):

+         osinfo[0] = "euleros"

+

++    if os.path.exists("/etc/photon-release"):

++        osinfo[0] = "photonos"

++

+     # The platform.py lib has issue with detecting BIG-IP linux distribution.

+     # Merge the following patch provided by F5.

+     if os.path.exists("/shared/vadc"):

+diff -rupN WALinuxAgent-2.2.14-old/config/photonos/waagent.conf WALinuxAgent-2.2.14/config/photonos/waagent.conf

+--- WALinuxAgent-2.2.14-old/config/photonos/waagent.conf	1969-12-31 16:00:00.000000000 -0800

+@@ -0,0 +1,81 @@

++#

++# Microsoft Azure Linux Agent Configuration

++#

++

++# Specified program is invoked with the argument "Ready" when we report ready status

++# to the endpoint server.

++Role.StateConsumer=None

++

++# Specified program is invoked with XML file argument specifying role

++#  configuration.

++Role.ConfigurationConsumer=None

++

++# Specified program is invoked with XML file argument specifying role topology.

++Role.TopologyConsumer=None

++

++# Enable instance creation

++Provisioning.Enabled=y

++

++# Rely on cloud-init to provision

++Provisioning.UseCloudInit=n

++

++# Password authentication for root account will be unavailable.

++Provisioning.DeleteRootPassword=y

++

++# Generate fresh host key pair.

++Provisioning.RegenerateSshHostKeyPair=y

++

++# Supported values are "rsa", "dsa" and "ecdsa".

++Provisioning.SshHostKeyPairType=rsa

++

++# Monitor host name changes and publish changes via DHCP requests.

++Provisioning.MonitorHostName=y

++

++# Decode CustomData from Base64.

++Provisioning.DecodeCustomData=y

++

++# Execute CustomData after provisioning.

++Provisioning.ExecuteCustomData=n

++

++# Allow reset password of sys user

++Provisioning.AllowResetSysUser=n

++

++# Format if unformatted. If 'n', resource disk will not be mounted.

++ResourceDisk.Format=y

++

++# File system on the resource disk

++# Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.

++ResourceDisk.Filesystem=ext4

++

++# Mount point for the resource disk

++ResourceDisk.MountPoint=/mnt/resource

++

++# Create and use swapfile on resource disk.

++ResourceDisk.EnableSwap=n

++

++# Size of the swapfile.

++ResourceDisk.SwapSizeMB=0

++

++# Enable verbose logging (y|n)

++Logs.Verbose=n

++

++# Is FIPS enabled

++OS.EnableFIPS=n

++

++# Root device timeout in seconds.

++OS.RootDeviceScsiTimeout=300

++

++# If "None", the system default version is used.

++OS.OpensslPath=None

++

++# Set the path to SSH keys and configuration files

++OS.SshDir=/etc/ssh

++

++# Enable or disable self-update, default is enabled

++AutoUpdate.Enabled=y

++AutoUpdate.GAFamily=Prod

++

++# Determine if the overprovisioning feature is enabled. If yes, hold extension

++# handling until inVMArtifactsProfile.OnHold is false.

++# Default is disabled

++# EnableOverProvisioning=n

+diff -rupN WALinuxAgent-2.2.14-old/init/photonos/waagent.service WALinuxAgent-2.2.14/init/photonos/waagent.service

+--- WALinuxAgent-2.2.14-old/init/photonos/waagent.service	1969-12-31 16:00:00.000000000 -0800

+@@ -0,0 +1,16 @@

++[Unit]

++Description=Azure Linux Agent

++Wants=network-online.target sshd.service sshd-keygen.service

++After=network-online.target

++

++ConditionFileIsExecutable=/usr/bin/waagent

++ConditionPathExists=/etc/waagent.conf

++

++[Service]

++Type=simple

++ExecStart=/usr/bin/python -u /usr/bin/waagent -daemon

++Restart=always

++RestartSec=5

++

++[Install]

++WantedBy=multi-user.target

+diff -rupN WALinuxAgent-2.2.14-old/setup.py WALinuxAgent-2.2.14/setup.py

+--- WALinuxAgent-2.2.14-old/setup.py	2017-06-22 16:00:39.000000000 -0700

+@@ -112,6 +112,12 @@ def get_data_files(name, version, fullna

+                        src=["config/clearlinux/waagent.conf"])

+         set_systemd_files(data_files, dest='/usr/lib/systemd/system',

+                           src=["init/clearlinux/waagent.service"])

++    elif name == 'photonos':

++        set_bin_files(data_files, dest="/usr/bin")

++        set_conf_files(data_files, dest="/etc",

++                       src=["config/photonos/waagent.conf"])

++        set_systemd_files(data_files, dest='/usr/lib/systemd/system',

++                          src=["init/photonos/waagent.service"])

+     elif name == 'ubuntu':

+         set_bin_files(data_files)

+         set_conf_files(data_files, src=["config/ubuntu/waagent.conf"])

@@ -8,6 +8,9 @@ ln -s ../docker.service docker.service

 ln -s ../waagent.service waagent.service

 ln -s ../sshd-keygen.service sshd-keygen.service

+#Disable cloud-init

+rm -rf /etc/systemd/system/cloud-init.target.wants

+

 # Remove ssh host keys and add script to regenerate them at boot time.

 rm -f /etc/ssh/ssh_host_*

@@ -15,7 +18,7 @@ rm -f /etc/ssh/ssh_host_*

 sudo groupadd docker

 sudo groupadd sudo

-rm /root/.ssh/authorized_keys   

+rm /root/.ssh/authorized_keys

 # ssh server config

 # Override old values

@@ -48,15 +51,11 @@ echo "Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,

 echo "Tunnel no" >> /etc/ssh/ssh_config

 echo "ServerAliveInterval 180" >> /etc/ssh/ssh_config

-sed -i 's/net.ifnames=0//' /boot/grub/grub.cfg

-sed -i 's/$photon_cmdline/init=\/lib\/systemd\/systemd loglevel=3 ro console=ttyS0 earlyprintk=ttyS0 rootdelay=30/' /boot/grub/grub.cfg

+sed -i 's/$photon_cmdline $systemd_cmdline/init=\/lib\/systemd\/systemd loglevel=3 ro console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0,115200 fsck.repair=yes rootdelay=300/' /boot/grub/grub.cfg

-# Disable loading/unloading of modules

-echo 1 > /proc/sys/kernel/modules_disabled

 # Remove kernel symbols

 rm /boot/system.map*

-sudo waagent -force -deprovision

-export HISTSIZE=0

-systemctl enable waagent.service

+waagent -force -deprovision+user

+export HISTSIZE=0

\ No newline at end of file