From 83432149e212155469b1e9f06eb0095121377356 Mon Sep 17 00:00:00 2001
From: Ben Howard <ben.howard@ubuntu.com>
Date: Mon, 7 Dec 2015 16:48:51 -0700
Subject: Import patches-unapplied version 2.1.2-0ubuntu1 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 04946cba49f19c0b6b876bccdbb36d47334af002

New changelog entries:
  * New upstream release (LP: #1523715):
    - Bug fixes for Ubuntu 15.10 on Azure
    - Enablement for Azure Stack
    - Dropped patch for systemd job as upstream now includes it.
---
 azurelinuxagent/distro/ubuntu/loader.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'azurelinuxagent/distro/ubuntu/loader.py')

diff --git a/azurelinuxagent/distro/ubuntu/loader.py b/azurelinuxagent/distro/ubuntu/loader.py
index 26db4fa..3fe2239 100644
--- a/azurelinuxagent/distro/ubuntu/loader.py
+++ b/azurelinuxagent/distro/ubuntu/loader.py
@@ -1,4 +1,4 @@
-# Windows Azure Linux Agent
+# Microsoft Azure Linux Agent
 #
 # Copyright 2014 Microsoft Corporation
 #
@@ -17,16 +17,20 @@
 # Requires Python 2.4+ and Openssl 1.0+
 #
 
-from azurelinuxagent.metadata import DISTRO_NAME, DISTRO_VERSION
+from azurelinuxagent.metadata import DISTRO_NAME, DISTRO_VERSION, DISTRO_FULL_NAME
 
 def get_osutil():
     from  azurelinuxagent.distro.ubuntu.osutil import Ubuntu1204OSUtil, \
                                                       UbuntuOSUtil, \
-                                                      Ubuntu14xOSUtil
+                                                      Ubuntu14xOSUtil, \
+                                                      UbuntuSnappyOSUtil
+
     if DISTRO_VERSION == "12.04":
         return Ubuntu1204OSUtil()
     elif DISTRO_VERSION == "14.04" or DISTRO_VERSION == "14.10":
         return Ubuntu14xOSUtil()
+    elif DISTRO_FULL_NAME == "Snappy Ubuntu Core":
+        return UbuntuSnappyOSUtil()
     else:
         return UbuntuOSUtil()
 
-- 
cgit v1.2.3