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, 14 insertions, 19 deletions

diff --git a/azurelinuxagent/pa/deprovision/ubuntu.py b/azurelinuxagent/pa/deprovision/ubuntu.py
index 14f90de..b45d415 100644
--- a/azurelinuxagent/pa/deprovision/ubuntu.py
+++ b/azurelinuxagent/pa/deprovision/ubuntu.py
@@ -18,30 +18,25 @@
 #
 
 import os
-import azurelinuxagent.common.logger as logger
 import azurelinuxagent.common.utils.fileutil as fileutil
 from azurelinuxagent.pa.deprovision.default import DeprovisionHandler, \
-                                                   DeprovisionAction
-
-def del_resolv():
-    if os.path.realpath('/etc/resolv.conf') != '/run/resolvconf/resolv.conf':
-        logger.info("resolvconf is not configured. Removing /etc/resolv.conf")
-        fileutil.rm_files('/etc/resolv.conf')
-    else:
-        logger.info("resolvconf is enabled; leaving /etc/resolv.conf intact")
-        fileutil.rm_files('/etc/resolvconf/resolv.conf.d/tail',
-                             '/etc/resolvconf/resolv.conf.d/originial')
+    DeprovisionAction
 
 
 class UbuntuDeprovisionHandler(DeprovisionHandler):
     def __init__(self):
         super(UbuntuDeprovisionHandler, self).__init__()
 
-    def setup(self, deluser):
-        warnings, actions = super(UbuntuDeprovisionHandler, self).setup(deluser)
-        warnings.append("WARNING! Nameserver configuration in "
-                        "/etc/resolvconf/resolv.conf.d/{tail,originial} "
-                        "will be deleted.")
-        actions.append(DeprovisionAction(del_resolv))
-        return warnings, actions
-
+    def del_resolv(self, warnings, actions):
+        if os.path.realpath(
+                '/etc/resolv.conf') != '/run/resolvconf/resolv.conf':
+            warnings.append("WARNING! /etc/resolv.conf will be deleted.")
+            files_to_del = ["/etc/resolv.conf"]
+            actions.append(DeprovisionAction(fileutil.rm_files, files_to_del))
+        else:
+            warnings.append("WARNING! /etc/resolvconf/resolv.conf.d/tail "
+                            "and /etc/resolvconf/resolv.conf.d/original will "
+                            "be deleted.")
+            files_to_del = ["/etc/resolvconf/resolv.conf.d/tail",
+                            "/etc/resolvconf/resolv.conf.d/original"]
+            actions.append(DeprovisionAction(fileutil.rm_files, files_to_del))