From d064ab0bffd429382ea4fafeb144784d403848bd Mon Sep 17 00:00:00 2001
From: Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>
Date: Mon, 16 Jan 2017 10:10:41 +0100
Subject: Import patches-unapplied version 2.2.2-0ubuntu1 to
 ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 63d399807de30a64456e672063e7c20babf7aadc

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
---
 azurelinuxagent/common/osutil/factory.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'azurelinuxagent/common/osutil/factory.py')

diff --git a/azurelinuxagent/common/osutil/factory.py b/azurelinuxagent/common/osutil/factory.py
index 5e8ae6e..2718ba1 100644
--- a/azurelinuxagent/common/osutil/factory.py
+++ b/azurelinuxagent/common/osutil/factory.py
@@ -21,6 +21,7 @@ from azurelinuxagent.common.version import DISTRO_NAME, DISTRO_VERSION, \
                                      DISTRO_FULL_NAME
 
 from .default import DefaultOSUtil
+from .clearlinux import ClearLinuxUtil
 from .coreos import CoreOSUtil
 from .debian import DebianOSUtil
 from .freebsd import FreeBSDOSUtil
@@ -28,9 +29,13 @@ from .redhat import RedhatOSUtil, Redhat6xOSUtil
 from .suse import SUSEOSUtil, SUSE11OSUtil
 from .ubuntu import UbuntuOSUtil, Ubuntu12OSUtil, Ubuntu14OSUtil, \
                     UbuntuSnappyOSUtil
+from .alpine import AlpineOSUtil
+from .bigip import BigIpOSUtil
 
 def get_osutil(distro_name=DISTRO_NAME, distro_version=DISTRO_VERSION,
                distro_full_name=DISTRO_FULL_NAME):
+    if distro_name == "clear linux software for intel architecture":
+        return ClearLinuxUtil()
     if distro_name == "ubuntu":
         if Version(distro_version) == Version("12.04") or \
            Version(distro_version) == Version("12.10"):
@@ -42,6 +47,10 @@ def get_osutil(distro_name=DISTRO_NAME, distro_version=DISTRO_VERSION,
             return UbuntuSnappyOSUtil()
         else:
             return UbuntuOSUtil()
+    if distro_name == "alpine":
+        return AlpineOSUtil()
+    if distro_name == "kali":
+        return DebianOSUtil()    
     if distro_name == "coreos":
         return CoreOSUtil()
     if distro_name == "suse":
@@ -62,8 +71,10 @@ def get_osutil(distro_name=DISTRO_NAME, distro_version=DISTRO_VERSION,
             return RedhatOSUtil()
     elif distro_name == "freebsd":
         return FreeBSDOSUtil()
+    elif distro_name == "bigip":
+        return BigIpOSUtil()
     else:
-        logger.warn("Unable to load distro implemetation for {0}.", distro_name)
-        logger.warn("Use default distro implemetation instead.")
+        logger.warn("Unable to load distro implementation for {0}.", distro_name)
+        logger.warn("Use default distro implementation instead.")
         return DefaultOSUtil()
 
-- 
cgit v1.2.3