Update systemd unit file and waagent.conf for Ubuntu15.10

config/ubuntu/waagent.conf

@@ -48,7 +48,7 @@ ResourceDisk.Format=n
 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

init/ubuntu/walinuxagent.service

@@ -1,7 +1,9 @@
 [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