From 5a3f57acdee1f44c031ec23f13bc25f4765e8871 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Tue, 18 Nov 2014 05:40:07 -0700 Subject: Import patches-unapplied version 2.0.8-0ubuntu4 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: e5815bd0c9096099b3da92b69578f0afb1066ce4 New changelog entries: * Moved dependency of linux-image-extra-virtual to recommends. --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e2b5bce..3e10a1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +walinuxagent (2.0.8-0ubuntu4) vivid; urgency=medium + + * Moved dependency of linux-image-extra-virtual to recommends. + + -- Ben Howard Tue, 18 Nov 2014 05:40:07 -0700 + walinuxagent (2.0.8-0ubuntu3) vivid; urgency=medium * Changed startup ordering to on ephemeral disk warning as the warning diff --git a/debian/control b/debian/control index b6991b5..49be347 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,6 @@ Homepage: http://go.microsoft.com/fwlink/?LinkId=250998 Package: walinuxagent Architecture: amd64 Depends: cloud-init (>=0.7.3~bzr826-0ubuntu2), - linux-image-extra-virtual, openssh-server (>=1:5.9p1), openssl (>=1.0), passwd (>=4.1.4.2), @@ -19,6 +18,7 @@ Depends: cloud-init (>=0.7.3~bzr826-0ubuntu2), util-linux (>=2.0), ${misc:Depends}, ${python:Depends} +Recommends: linux-image-extra-virtual Conflicts: network-manager Description: Windows Azure Linux Agent The Windows Azure Linux Agent supports the provisioning and running of Linux -- cgit v1.2.3 From c2489b98bfe66b33f157eced992cad63a02b45b7 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Tue, 18 Nov 2014 05:40:07 -0700 Subject: Prevent the removal of udev rules by agent Gbp-Pq: disable-udev-rules.patch. --- waagent | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/waagent b/waagent index fcaa71e..eb6a64b 100644 --- a/waagent +++ b/waagent @@ -90,8 +90,7 @@ ExtensionChildren = [] 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 -- cgit v1.2.3 From 8bd34c04be62f6844c876aa63f9538f6a2dcc086 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Tue, 18 Nov 2014 05:40:07 -0700 Subject: Disable provisioning Gbp-Pq: disable_provisioning.patch. --- config/waagent.conf | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/config/waagent.conf b/config/waagent.conf index c7cb96a..5e26508 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -1,6 +1,9 @@ # # Windows Azure Linux Agent Configuration # +# Ubuntu uses Cloud-init to provision on Windows Azure. This configuration +# file is used to ensure that cloud-init does the prep of the disk +# # Specified program is invoked with the argument "Ready" when we report ready status # to the endpoint server. @@ -14,29 +17,29 @@ Role.ConfigurationConsumer=None 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 # 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 -# ount point for the resource disk -ResourceDisk.MountPoint=/mnt/resource +# Mount point for the resource disk +ResourceDisk.MountPoint=/mnt # Create and use swapfile on resource disk. ResourceDisk.EnableSwap=n -- cgit v1.2.3 From 241f580be462ae72980b0d2f7e4efdd27b27b674 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Tue, 18 Nov 2014 05:40:07 -0700 Subject: fixup_setup_file.patch No DEP3 Subject or Description header found Gbp-Pq: fixup_setup_file.patch. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 846d8e7..5af4797 100755 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ class InstallData(install): def initialize_options(self): install.initialize_options(self) - self.init_system = 'sysV' + self.init_system = 'upstart' self.lnx_distro = None def finalize_options(self): -- cgit v1.2.3 From 24d6d2dd68d85bfd69c9fc5c54fe9aaa056cc775 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Tue, 18 Nov 2014 05:40:07 -0700 Subject: cloud-init-default-cfg.patch No DEP3 Subject or Description header found Gbp-Pq: cloud-init-default-cfg.patch. --- config/91_walinuxagent.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 config/91_walinuxagent.cfg diff --git a/config/91_walinuxagent.cfg b/config/91_walinuxagent.cfg new file mode 100644 index 0000000..b7049fc --- /dev/null +++ b/config/91_walinuxagent.cfg @@ -0,0 +1,3 @@ +# This configuration file is provided by the WALinuxAgent package. +datasource_list: [ Azure ] + -- cgit v1.2.3 From 4b9414f166564f291049883926319367c9867b98 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Tue, 18 Nov 2014 05:40:07 -0700 Subject: Fix for broken sshd configuration (LP: #1305418) Gbp-Pq: sshd_config_newline_fix.patch. --- waagent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waagent b/waagent index eb6a64b..2c69ceb 100644 --- a/waagent +++ b/waagent @@ -3838,7 +3838,7 @@ class OvfEnv(object): # Disable RFC 4252 and RFC 4256 authentication schemes. ReplaceFileContentsAtomic(filepath, "\n".join(filter(lambda a: not (a.startswith("PasswordAuthentication") or a.startswith("ChallengeResponseAuthentication")), - GetFileContents(filepath).split('\n'))) + "PasswordAuthentication no\nChallengeResponseAuthentication no\n") + GetFileContents(filepath).split('\n'))) + "\nPasswordAuthentication no\nChallengeResponseAuthentication no\n") Log("Disabled SSH password-based authentication methods.") if self.AdminPassword != None: MyDistro.changePass('root',self.AdminPassword) -- cgit v1.2.3