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