Import patches-unapplied version 2.1.1-0ubuntu1 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: 0afc048f2a6ff3638ecfa33e7ded5dc8dddf041a

New changelog entries:
  * New upstream release for Ubuntu.
    - Switch to Python3
    - Applies Ubuntu specific patches

1 files changed, 90 insertions, 0 deletions

diff --git a/azurelinuxagent/distro/coreos/osutil.py b/azurelinuxagent/distro/coreos/osutil.py
new file mode 100644
index 0000000..6dfba64
--- /dev/null
+++ b/azurelinuxagent/distro/coreos/osutil.py
@@ -0,0 +1,90 @@
+#
+# 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 re
+import pwd
+import shutil
+import socket
+import array
+import struct
+import fcntl
+import time
+import base64
+import azurelinuxagent.logger as logger
+import azurelinuxagent.utils.fileutil as fileutil
+import azurelinuxagent.utils.shellutil as shellutil
+import azurelinuxagent.utils.textutil as textutil
+from azurelinuxagent.distro.default.osutil import DefaultOSUtil
+
+class CoreOSUtil(DefaultOSUtil):
+    def __init__(self):
+        super(CoreOSUtil, self).__init__()
+        self.waagent_path='/usr/share/oem/bin/waagent'
+        self.python_path='/usr/share/oem/python/bin'
+        self.conf_path = '/usr/share/oem/waagent.conf'
+        if 'PATH' in os.environ:
+            path = "{0}:{1}".format(os.environ['PATH'], self.python_path)
+        else:
+            path = self.python_path
+        os.environ['PATH'] = path
+
+        if 'PYTHONPATH' in os.environ:
+            py_path = os.environ['PYTHONPATH']
+            py_path = "{0}:{1}".format(py_path, self.waagent_path)
+        else:
+            py_path = self.waagent_path
+        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).IsSysUser(username)
+
+    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):
+        return shellutil.run("systemctl restart sshd", chk_err=False)
+
+    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 wagent", chk_err=False)
+
+    def stop_agent_service(self):
+        return shellutil.run("systemctl stop wagent", 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 decode_customdata(self, data):
+        return base64.b64decode(data)
+