From 5009a9d0f3606fc08a80ec0d59076d8dc48d2f25 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Tue, 13 Sep 2016 16:11:47 +0100
Subject: Import patches-unapplied version 2.1.5-0ubuntu1 to
 ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6

New changelog entries:
  * New upstream release (LP: #1603581)
    - d/patches/disable-auto-update.patch:
      - The new version introduces auto-updating of the agent to its latest
        version via an internal mechanism; disable this
    - d/patches/fix_shebangs.patch:
      - Dropped in favour of the dh_python3 --shebang option.
    - Refreshed d/patches/disable_udev_overrides.patch
---
 azurelinuxagent/pa/deprovision/ubuntu.py | 47 ++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 azurelinuxagent/pa/deprovision/ubuntu.py

(limited to 'azurelinuxagent/pa/deprovision/ubuntu.py')

diff --git a/azurelinuxagent/pa/deprovision/ubuntu.py b/azurelinuxagent/pa/deprovision/ubuntu.py
new file mode 100644
index 0000000..14f90de
--- /dev/null
+++ b/azurelinuxagent/pa/deprovision/ubuntu.py
@@ -0,0 +1,47 @@
+# Microsoft Azure Linux Agent
+#
+# Copyright 2014 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 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')
+
+
+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
+
-- 
cgit v1.2.3