diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2015-12-07 16:48:51 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2015-12-08 16:10:11 +0000 |
| commit | 542c7a834728ad35d7f5f98cacdf78d86721656f (patch) | |
| tree | 6850cbc7ce3dec800c1b50f23da6b76077198159 /azurelinuxagent/distro/ubuntu/loader.py | |
| parent | f6e3f158c2fb9021b37654ea20839ec7a4308d52 (diff) | |
| parent | f4e6aca60e419eafbdf11bdd631d35cf785735ae (diff) | |
| download | vyos-walinuxagent-542c7a834728ad35d7f5f98cacdf78d86721656f.tar.gz vyos-walinuxagent-542c7a834728ad35d7f5f98cacdf78d86721656f.zip | |
Import patches-applied version 2.1.2-0ubuntu1 to applied/ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: f6e3f158c2fb9021b37654ea20839ec7a4308d52
Unapplied parent: f4e6aca60e419eafbdf11bdd631d35cf785735ae
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.
Diffstat (limited to 'azurelinuxagent/distro/ubuntu/loader.py')
| -rw-r--r-- | azurelinuxagent/distro/ubuntu/loader.py | 10 |
1 files changed, 7 insertions, 3 deletions
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() |