From 9c99e6732b43e85ec4e774daec0ae47d240d9e55 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 26 Nov 2014 11:41:59 -0700 Subject: Import patches-unapplied version 2.0.8-0ubuntu5 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: 5a3f57acdee1f44c031ec23f13bc25f4765e8871 New changelog entries: * Changes to support systemd - debian/walinuxagent.service: symlink to upstream service - debian/rules: build with systemd - debain/control: added dh_python and dh_systemd to build deps --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/rules | 2 +- debian/walinuxagent.service | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) create mode 120000 debian/walinuxagent.service diff --git a/debian/changelog b/debian/changelog index 3e10a1f..d2c1f8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +walinuxagent (2.0.8-0ubuntu5) vivid; urgency=medium + + * Changes to support systemd + - debian/walinuxagent.service: symlink to upstream service + - debian/rules: build with systemd + - debain/control: added dh_python and dh_systemd to build deps + + -- Ben Howard Wed, 26 Nov 2014 11:41:59 -0700 + walinuxagent (2.0.8-0ubuntu4) vivid; urgency=medium * Moved dependency of linux-image-extra-virtual to recommends. diff --git a/debian/control b/debian/control index 49be347..a167101 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: python Priority: extra Maintainer: Ben Howard XSBC-Original-Maintainer: Microsoft Corporation -Build-Depends: debhelper (>= 8), python-all, python-setuptools +Build-Depends: debhelper (>= 8), python-all, python-setuptools, dh-systemd, dh-python Standards-Version: 3.9.5 XS-Python-Version: all Homepage: http://go.microsoft.com/fwlink/?LinkId=250998 diff --git a/debian/rules b/debian/rules index b54cee2..5b9c8e9 100755 --- a/debian/rules +++ b/debian/rules @@ -10,4 +10,4 @@ get-packaged-orig-source: -o walinuxagent_$(DEB_VERSION).orig.tar.gz %: - dh $@ --with python2 + dh $@ --with python2,systemd diff --git a/debian/walinuxagent.service b/debian/walinuxagent.service new file mode 120000 index 0000000..39e4603 --- /dev/null +++ b/debian/walinuxagent.service @@ -0,0 +1 @@ +../distro/systemd/waagent.service \ No newline at end of file -- cgit v1.2.3 From 8bbbece121ab1f07c1614cafe210b3862b34adbb Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 26 Nov 2014 11:41:59 -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 8c8ceb852c64fdfa60ef64552e90b5384621b7f5 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 26 Nov 2014 11:41:59 -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 2636d8bf5c96c3c618cfd7f4a3fa1f3c5bc32db0 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 26 Nov 2014 11:41:59 -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 be9fc8f27f67167d911fa95fc73f746323588ded Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 26 Nov 2014 11:41:59 -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 e7e031e67cf2e24f7f94d26d7710bee7c61cb95a Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 26 Nov 2014 11:41:59 -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