From c876364505e21939344ddb6d9f413643ddfe2c38 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 14 Sep 2016 13:06:56 -0400 Subject: Import patches-unapplied version 2.1.5-0ubuntu2 to ubuntu/yakkety-proposed Imported using git-ubuntu import. Changelog parent: 5009a9d0f3606fc08a80ec0d59076d8dc48d2f25 New changelog entries: * debian/walinuxagent.service: remove cloud-final.service from both Wants and After. (LP: #1623570) --- debian/changelog | 7 +++++ ...just-walinuxagent-service-after-and-wants.patch | 33 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 41 insertions(+) create mode 100644 debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch diff --git a/debian/changelog b/debian/changelog index ed5f944..2d25cf0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +walinuxagent (2.1.5-0ubuntu2) yakkety; urgency=medium + + * debian/walinuxagent.service: remove cloud-final.service from + both Wants and After. (LP: #1623570) + + -- Scott Moser Wed, 14 Sep 2016 13:06:56 -0400 + walinuxagent (2.1.5-0ubuntu1) yakkety; urgency=medium * New upstream release (LP: #1603581) diff --git a/debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch b/debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch new file mode 100644 index 0000000..bb034cf --- /dev/null +++ b/debian/patches/lp1623570-adjust-walinuxagent-service-after-and-wants.patch @@ -0,0 +1,33 @@ +Description: walinuxagent.service: adjust Wants and After + There is no reason for walinuxagent.service to Want + cloud-final.service. That could cause problems if cloud-init was + disabled. + . + There is also no reason for it to need to run After cloud-final. + Instead replace that with After of cloud-init. That will ensure + that cloud-init in its datasource code has an opportunity affect + walinuxagent before it starts. + . + The need for this is because cloud-init was starting walinux.service + during cloud-init.service, which would cause unresolvable + cyclic dependencies. +Author: Scott Moser +Forwarded: https://github.com/Azure/WALinuxAgent/pull/426 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1623570 +Bug-Upstream: https://github.com/Azure/WALinuxAgent/issues/425 +Last-Update: 2016-09-14 + + +--- a/init/ubuntu/walinuxagent.service ++++ b/init/ubuntu/walinuxagent.service +@@ -7,8 +7,8 @@ + [Unit] + Description=Azure Linux Agent + +-After=network-online.target cloud-final.service +-Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service ++After=network-online.target cloud-init.service ++Wants=network-online.target sshd.service sshd-keygen.service + + ConditionFileIsExecutable=/usr/sbin/waagent + ConditionPathExists=/etc/waagent.conf diff --git a/debian/patches/series b/debian/patches/series index 452e72a..8c08198 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ disable-auto-update.patch cloud-init-default-cfg.patch disable_import_test.patch disable_udev_overrides.patch +lp1623570-adjust-walinuxagent-service-after-and-wants.patch -- cgit v1.2.3 From 65a714cda8ffebae9fa34d6c744be07bba0d4a77 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 14 Sep 2016 13:06:56 -0400 Subject: disable-auto-update.patch No DEP3 Subject or Description header found Gbp-Pq: disable-auto-update.patch. --- config/ubuntu/waagent.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/ubuntu/waagent.conf b/config/ubuntu/waagent.conf index ca68044..cb31824 100644 --- a/config/ubuntu/waagent.conf +++ b/config/ubuntu/waagent.conf @@ -82,5 +82,5 @@ OS.OpensslPath=None # OS.EnableRDMA=y # Enable or disable self-update, default is enabled -AutoUpdate.Enabled=y +AutoUpdate.Enabled=n AutoUpdate.GAFamily=Prod -- cgit v1.2.3 From 3219d8102c5963d70d444a1303f6de95581c409b Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 14 Sep 2016 13:06:56 -0400 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 9dde48be4ae792608f98808e2023a998c88a2fbc Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 14 Sep 2016 13:06:56 -0400 Subject: disable_import_test.patch No DEP3 Subject or Description header found Gbp-Pq: disable_import_test.patch. --- config/waagent.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/waagent.conf b/config/waagent.conf index c28a651..655a9f2 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -14,13 +14,13 @@ 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 @@ -44,14 +44,14 @@ Provisioning.ExecuteCustomData=n Provisioning.AllowResetSysUser=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 -- cgit v1.2.3 From e20836be06c4caa7ddbee401f591fd19b704c5d2 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 14 Sep 2016 13:06:56 -0400 Subject: disable_udev_overrides.patch No DEP3 Subject or Description header found Gbp-Pq: disable_udev_overrides.patch. --- bin/waagent2.0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/waagent2.0 b/bin/waagent2.0 index abc4448..8563554 100644 --- a/bin/waagent2.0 +++ b/bin/waagent2.0 @@ -95,8 +95,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 f6ae386a6923e361699a49b6111c16916c5b9158 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Wed, 14 Sep 2016 13:06:56 -0400 Subject: walinuxagent.service: adjust Wants and After Gbp-Pq: lp1623570-adjust-walinuxagent-service-after-and-wants.patch. --- init/ubuntu/walinuxagent.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init/ubuntu/walinuxagent.service b/init/ubuntu/walinuxagent.service index ae8dccb..3cf47c5 100755 --- a/init/ubuntu/walinuxagent.service +++ b/init/ubuntu/walinuxagent.service @@ -7,8 +7,8 @@ [Unit] Description=Azure Linux Agent -After=network-online.target cloud-final.service -Wants=network-online.target sshd.service sshd-keygen.service cloud-final.service +After=network-online.target cloud-init.service +Wants=network-online.target sshd.service sshd-keygen.service ConditionFileIsExecutable=/usr/sbin/waagent ConditionPathExists=/etc/waagent.conf -- cgit v1.2.3