diff options
| author | Daniel Watkins <daniel.watkins@canonical.com> | 2016-09-13 16:11:47 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-09-14 10:39:12 +0000 |
| commit | 5009a9d0f3606fc08a80ec0d59076d8dc48d2f25 (patch) | |
| tree | ad67eef74c5208178950db6ee28195e2137fa713 /debian/patches | |
| parent | 0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6 (diff) | |
| download | vyos-walinuxagent-5009a9d0f3606fc08a80ec0d59076d8dc48d2f25.tar.gz vyos-walinuxagent-5009a9d0f3606fc08a80ec0d59076d8dc48d2f25.zip | |
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
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/disable-auto-update.patch | 9 | ||||
| -rw-r--r-- | debian/patches/disable_udev_overrides.patch | 25 | ||||
| -rw-r--r-- | debian/patches/fix_shebangs.patch | 24 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
4 files changed, 10 insertions, 50 deletions
diff --git a/debian/patches/disable-auto-update.patch b/debian/patches/disable-auto-update.patch new file mode 100644 index 0000000..166c6ec --- /dev/null +++ b/debian/patches/disable-auto-update.patch @@ -0,0 +1,9 @@ +--- a/config/ubuntu/waagent.conf ++++ b/config/ubuntu/waagent.conf +@@ -82,5 +82,5 @@ + # OS.EnableRDMA=y + + # Enable or disable self-update, default is enabled +-AutoUpdate.Enabled=y ++AutoUpdate.Enabled=n + AutoUpdate.GAFamily=Prod diff --git a/debian/patches/disable_udev_overrides.patch b/debian/patches/disable_udev_overrides.patch index e0bb607..7c344d0 100644 --- a/debian/patches/disable_udev_overrides.patch +++ b/debian/patches/disable_udev_overrides.patch @@ -10,28 +10,3 @@ VarLibDhcpDirectories = ["/var/lib/dhclient", "/var/lib/dhcpcd", "/var/lib/dhcp"] EtcDhcpClientConfFiles = ["/etc/dhcp/dhclient.conf", "/etc/dhcp3/dhclient.conf"] global LibDir ---- a/azurelinuxagent/distro/ubuntu/osutil.py -+++ b/azurelinuxagent/distro/ubuntu/osutil.py -@@ -44,6 +44,12 @@ - def start_agent_service(self): - return shellutil.run("service walinuxagent start", chk_err=False) - -+ def remove_rules_files(self, rules_files=""): -+ pass -+ -+ def restore_rules_files(self, rules_files=""): -+ pass -+ - class Ubuntu12OSUtil(Ubuntu14OSUtil): - def __init__(self): - super(Ubuntu12OSUtil, self).__init__() -@@ -67,9 +73,3 @@ - def __init__(self): - super(UbuntuSnappyOSUtil, self).__init__() - self.conf_file_path = '/apps/walinuxagent/current/waagent.conf' -- -- def remove_rules_files(self, rules_files=""): -- pass -- -- def restore_rules_files(self, rules_files=""): -- pass diff --git a/debian/patches/fix_shebangs.patch b/debian/patches/fix_shebangs.patch deleted file mode 100644 index 828b0f2..0000000 --- a/debian/patches/fix_shebangs.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3n3n3 - # - # Microsoft Azure Linux Agent setup.py - # ---- a/bin/waagent -+++ b/bin/waagent -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Azure Linux Agent - # ---- a/bin/waagent2.0 -+++ b/bin/waagent2.0 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Azure Linux Agent - # diff --git a/debian/patches/series b/debian/patches/series index a2f35e0..452e72a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ +disable-auto-update.patch cloud-init-default-cfg.patch disable_import_test.patch disable_udev_overrides.patch -fix_shebangs.patch |