13 files changed, 50 insertions, 95 deletions
diff --git a/debian/changelog b/debian/changelog
index 9c9260d..566015a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+walinuxagent (2.1.1-0ubuntu1) wily; urgency=medium
+
+  * New upstream release for Ubuntu.
+    - Switch to Python3
+    - Applies Ubuntu specific patches
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Fri, 14 Aug 2015 16:40:41 -0600
+
 walinuxagent (2.0.14-0ubuntu1) wily; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 226c96f..a10e57e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: python
 Priority: extra
 Maintainer: Ben Howard <ben.howard@ubuntu.com>
 XSBC-Original-Maintainer: Microsoft Corporation <walinuxagent@microsoft.com>
-Build-Depends: debhelper (>= 8), python-all, python-setuptools, dh-systemd, dh-python
+Build-Depends: debhelper (>= 8), python3-all, python3-setuptools, dh-systemd
 Standards-Version: 3.9.6
-XS-Python-Version: all
+X-Python3-Version: >= 3.2
 Homepage: http://go.microsoft.com/fwlink/?LinkId=250998
 
 Package: walinuxagent
diff --git a/debian/install b/debian/install
index 21a75f4..5f441de 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,3 @@
-config/99-azure-product-uuid.rules lib/udev/rules.d
 config/91_walinuxagent.cfg etc/cloud/cloud.cfg.d
 debian/ephemeral-disk-warning.service lib/systemd/system
 debian/ephemeral-disk-warning.conf etc/init
diff --git a/debian/patches/build_info.txt b/debian/patches/build_info.txt
deleted file mode 100644
index f02ab12..0000000
--- a/debian/patches/build_info.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-serial=20150629
-orig_prefix=trusty-server-cloudimg
-suite=trusty
-build_name=server
diff --git a/debian/patches/disable-provisioning.patch b/debian/patches/disable-provisioning.patch
new file mode 100644
index 0000000..716ae12
--- /dev/null
+++ b/debian/patches/disable-provisioning.patch
@@ -0,0 +1,11 @@
+--- a/config/ubuntu/waagent.conf
++++ b/config/ubuntu/waagent.conf
+@@ -42,7 +42,7 @@
+ ResourceDisk.Filesystem=ext4
+ 
+ # Mount point for the resource disk
+-ResourceDisk.MountPoint=/mnt/resource
++ResourceDisk.MountPoint=/mnt
+ 
+ # Create and use swapfile on resource disk.
+ ResourceDisk.EnableSwap=n
diff --git a/debian/patches/disable-udev-rules-removal.patch b/debian/patches/disable-udev-rules-removal.patch
new file mode 100644
index 0000000..3f3adfb
--- /dev/null
+++ b/debian/patches/disable-udev-rules-removal.patch
@@ -0,0 +1,12 @@
+--- a/azurelinuxagent/distro/ubuntu/osutil.py
++++ b/azurelinuxagent/distro/ubuntu/osutil.py
+@@ -44,6 +44,9 @@
+     def start_agent_service(self):
+         return shellutil.run("service walinuxagent start", chk_err=False)
+ 
++    def remove_rules_files(self, *args):
++        return
++
+ class Ubuntu1204OSUtil(Ubuntu14xOSUtil):
+     def __init__(self):
+         super(Ubuntu1204OSUtil, self).__init__()
diff --git a/debian/patches/disable-udev-rules.patch b/debian/patches/disable-udev-rules.patch
deleted file mode 100644
index 8157f40..0000000
--- a/debian/patches/disable-udev-rules.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/waagent
-+++ b/waagent
-@@ -92,8 +92,7 @@
- VMM_STARTUP_SCRIPT_NAME='install'
- VMM_CONFIG_FILE_NAME='linuxosconfiguration.xml'
- global RulesFiles
--RulesFiles = [ "/lib/udev/rules.d/75-persistent-net-generator.rules",
--               "/etc/udev/rules.d/70-persistent-net.rules" ]
-+RulesFiles = []
- VarLibDhcpDirectories = ["/var/lib/dhclient", "/var/lib/dhcpcd", "/var/lib/dhcp"]
- EtcDhcpClientConfFiles = ["/etc/dhcp/dhclient.conf", "/etc/dhcp3/dhclient.conf"]
- global LibDir
diff --git a/debian/patches/disable_provisioning.patch b/debian/patches/disable_provisioning.patch
deleted file mode 100644
index 956d30b..0000000
--- a/debian/patches/disable_provisioning.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/config/waagent.conf
-+++ b/config/waagent.conf
-@@ -2,6 +2,11 @@
- # Windows Azure Linux Agent Configuration
- #
- 
-+# NOTE: Ubuntu uses Cloud-init for disk-provisioning. This will
-+# unless you disable Cloud-init disk provisioning. Please see
-+# /usr/share/doc/walinuxagent/99-cloud-init-disable-diskprovisioning.conf
-+#
-+
- # Specified program is invoked with the argument "Ready" when we report ready status
- # to the endpoint server.
- Role.StateConsumer=None
-@@ -14,19 +19,19 @@
- Role.TopologyConsumer=None
- 
- # Enable instance creation
--Provisioning.Enabled=y
-+Provisioning.Enabled=n
- 
- # Password authentication for root account will be unavailable.
--Provisioning.DeleteRootPassword=y
-+Provisioning.DeleteRootPassword=n
- 
- # Generate fresh host key pair.
--Provisioning.RegenerateSshHostKeyPair=y
-+Provisioning.RegenerateSshHostKeyPair=n
- 
- # Supported values are "rsa", "dsa" and "ecdsa".
- Provisioning.SshHostKeyPairType=rsa
- 
- # Monitor host name changes and publish changes via DHCP requests.
--Provisioning.MonitorHostName=y
-+Provisioning.MonitorHostName=n
- 
- # Decode CustomData from Base64.
- Provisioning.DecodeCustomData=n
-@@ -35,14 +40,14 @@
- Provisioning.ExecuteCustomData=n
- 
- # Format if unformatted. If 'n', resource disk will not be mounted.
--ResourceDisk.Format=y
-+ResourceDisk.Format=n
- 
- # File system on the resource disk
- # Typically ext3 or ext4. FreeBSD images should use 'ufs2' here.
- ResourceDisk.Filesystem=ext4
- 
- # Mount point for the resource disk
--ResourceDisk.MountPoint=/mnt/resource
-+ResourceDisk.MountPoint=/mnt
- 
- # Create and use swapfile on resource disk.
- ResourceDisk.EnableSwap=n
diff --git a/debian/patches/fixup_setup_file.patch b/debian/patches/fixup_setup_file.patch
deleted file mode 100644
index 845607d..0000000
--- a/debian/patches/fixup_setup_file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -51,7 +51,7 @@
- 
-     def initialize_options(self):
-         install.initialize_options(self)
--        self.init_system = 'sysV'
-+        self.init_system = 'upstart'
-         self.lnx_distro = None
- 
-     def finalize_options(self):
diff --git a/debian/patches/series b/debian/patches/series
index bddf5a0..9b3b2ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-fixup_setup_file.patch
 cloud-init-default-cfg.patch
-#disable_provisioning.patch
-disable-udev-rules.patch
-fix-waagent-service.patch
-disable_provisioning.patch
+start-after-cloudinit.patch
+disable-udev-rules-removal.patch
+disable-provisioning.patch
diff --git a/debian/patches/start-after-cloudinit.patch b/debian/patches/start-after-cloudinit.patch
new file mode 100644
index 0000000..235b70e
--- /dev/null
+++ b/debian/patches/start-after-cloudinit.patch
@@ -0,0 +1,12 @@
+--- a/init/ubuntu/walinuxagent.service
++++ b/init/ubuntu/walinuxagent.service
+@@ -1,7 +1,7 @@
+ [Unit]
+ Description=Azure Linux Agent
+-After=network.target
+-After=sshd.service
++After=network-online.target cloud-final.service
++Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service
+ ConditionFileIsExecutable=/usr/sbin/waagent
+ ConditionPathExists=/etc/waagent.conf
+ 
diff --git a/debian/rules b/debian/rules
index 412afa9..bb65f43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,4 @@
 #!/usr/bin/make -f
-INIT_SYSTEM ?= upstart,systemd
-export PYBUILD_INSTALL_ARGS=--init-system=$(INIT_SYSTEM)
-
 DEB_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 ORIG_SRC=https://github.com/WindowsAzure/WALinuxAgent
 
@@ -15,4 +12,4 @@ get-packaged-orig-source:
 	rm -rf orig_source
 
 %:
-	dh $@ --with python2,systemd
+	dh $@ --with python3,systemd  --buildsystem=pybuild
diff --git a/debian/walinuxagent.service b/debian/walinuxagent.service
index 1abb506..b1c7ed6 120000
--- a/debian/walinuxagent.service
+++ b/debian/walinuxagent.service
@@ -1 +1 @@
-../distro/systemd/walinuxagent.service
-\ No newline at end of file
+../init/ubuntu/walinuxagent.service
+\ No newline at end of file