Import patches-applied version 2.2.2-0ubuntu1 to applied/ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: a05019d9343d0fde153d75a8e61fb6f99d1d3ff3
Unapplied parent: 558111e33720eb8f1eaacf571cf4fadae2430286

New changelog entries:
  * New upstream release (LP: #1651128)
    - d/patches/fix-auto-update.patch,
      d/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch:
      - Dropped as changes have been applied upstream
    - Refreshed debian/patches/disable_import_test.patch

1 files changed, 16 insertions, 27 deletions

diff --git a/azurelinuxagent/common/osutil/coreos.py b/azurelinuxagent/common/osutil/coreos.py
index e26fd97..9d4f9b8 100644
--- a/azurelinuxagent/common/osutil/coreos.py
+++ b/azurelinuxagent/common/osutil/coreos.py
@@ -17,27 +17,15 @@
 #
 
 import os
-import re
-import pwd
-import shutil
-import socket
-import array
-import struct
-import fcntl
-import time
-import base64
-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 CoreOSUtil(DefaultOSUtil):
     def __init__(self):
         super(CoreOSUtil, self).__init__()
         self.agent_conf_file_path = '/usr/share/oem/waagent.conf'
-        self.waagent_path='/usr/share/oem/bin/waagent'
-        self.python_path='/usr/share/oem/python/bin'
+        self.waagent_path = '/usr/share/oem/bin/waagent'
+        self.python_path = '/usr/share/oem/python/bin'
         if 'PATH' in os.environ:
             path = "{0}:{1}".format(os.environ['PATH'], self.python_path)
         else:
@@ -52,22 +40,22 @@ class CoreOSUtil(DefaultOSUtil):
         os.environ['PYTHONPATH'] = py_path
 
     def is_sys_user(self, username):
-       #User 'core' is not a sysuser
-       if username == 'core':
-           return False
-       return super(CoreOSUtil, self).is_sys_user(username)
+        # User 'core' is not a sysuser.
+        if username == 'core':
+            return False
+        return super(CoreOSUtil, self).is_sys_user(username)
 
     def is_dhcp_enabled(self):
         return True
 
-    def start_network(self) :
+    def start_network(self):
         return shellutil.run("systemctl start systemd-networkd", chk_err=False)
 
-    def restart_if(self, iface):
+    def restart_if(self, *dummy, **_):
         shellutil.run("systemctl restart systemd-networkd")
 
     def restart_ssh_service(self):
-        # SSH is socket activated on CoreOS. No need to restart it.
+        # SSH is socket activated on CoreOS.  No need to restart it.
         pass
 
     def stop_dhcp_service(self):
@@ -77,16 +65,17 @@ class CoreOSUtil(DefaultOSUtil):
         return shellutil.run("systemctl start systemd-networkd", chk_err=False)
 
     def start_agent_service(self):
-        return shellutil.run("systemctl start wagent", chk_err=False)
+        return shellutil.run("systemctl start waagent", chk_err=False)
 
     def stop_agent_service(self):
-        return shellutil.run("systemctl stop wagent", chk_err=False)
+        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
+        ret = shellutil.run_get_output("systemctl show -p MainPID "
+                                       "systemd-networkd", chk_err=False)
+        pid = ret[1].split('=', 1)[-1].strip() if ret[0] == 0 else None
+        return pid if pid != '0' else None
 
     def conf_sshd(self, disable_password):
-        #In CoreOS, /etc/sshd_config is mount readonly. Skip the setting
+        # In CoreOS, /etc/sshd_config is mount readonly.  Skip the setting.
         pass
-