From 5af8d1f80caf5d49988dbb0cf95ad7c58250b90f Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 15 Apr 2015 10:59:38 -0600 Subject: Import patches-unapplied version 2.0.12-0ubuntu2 to ubuntu/vivid-proposed Imported using git-ubuntu import. Changelog parent: c40af8b3fec1b840776ca36d64b1857ed2bdd95b New changelog entries: * Fixed systemd unit file which caused SharedConfig.xml to be deleted by Cloud-init (LP: #1444086). --- debian/changelog | 9 ++++++++- debian/patches/fix-waagent-service.patch | 7 ++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 121361a..c4dddd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,13 @@ +walinuxagent (2.0.12-0ubuntu2) vivid; urgency=medium + + * Fixed systemd unit file which caused SharedConfig.xml to be deleted by + Cloud-init (LP: #1444086). + + -- Ben Howard Wed, 15 Apr 2015 10:59:38 -0600 + walinuxagent (2.0.12-0ubuntu1) vivid; urgency=medium - * New upstream release. + * New upstream release (LP: #1442392). * Added debian/watch for easier maintenance. * Fix regression of missing dataloss warning by adding systemd unit file. diff --git a/debian/patches/fix-waagent-service.patch b/debian/patches/fix-waagent-service.patch index a44cd75..b00ccb0 100644 --- a/debian/patches/fix-waagent-service.patch +++ b/debian/patches/fix-waagent-service.patch @@ -16,13 +16,14 @@ -WantedBy=multi-user.target --- /dev/null +++ b/distro/systemd/walinuxagent.service -@@ -0,0 +1,13 @@ +@@ -0,0 +1,14 @@ +[Unit] +Description=Windows Azure Linux Agent -+After=network.target -+Wants=sshd.service sshd-keygen.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 ++ConditionVirtualization=microsoft + +[Service] +Type=simple -- cgit v1.2.3 From 1d8f8bc618521096a01b23e76cb4b88d00c1c076 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 15 Apr 2015 10:59:38 -0600 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 cb7c3d4e33487609970913992a4cf462463c3517 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 15 Apr 2015 10:59:38 -0600 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 b44b36c842c3a23984f60d624d266919aa574e59 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 15 Apr 2015 10:59:38 -0600 Subject: disable_provisioning.patch No DEP3 Subject or Description header found Gbp-Pq: disable_provisioning.patch. --- config/waagent.conf | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/config/waagent.conf b/config/waagent.conf index 6a74125..3d6387b 100644 --- a/config/waagent.conf +++ b/config/waagent.conf @@ -14,30 +14,34 @@ 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 # Mount point for the resource disk -ResourceDisk.MountPoint=/mnt/resource +ResourceDisk.MountPoint=/mnt +# 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 +# # Create and use swapfile on resource disk. ResourceDisk.EnableSwap=n -- cgit v1.2.3 From 8a7a8e7e87594a8c2d13e37bd956dc25d3778d94 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 15 Apr 2015 10:59:38 -0600 Subject: disable-udev-rules.patch No DEP3 Subject or Description header found Gbp-Pq: disable-udev-rules.patch. --- waagent | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/waagent b/waagent index cbd005b..d6689f5 100644 --- a/waagent +++ b/waagent @@ -92,8 +92,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 b0cf660583d47ae85c1cbd322ab6741bfca47b07 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Wed, 15 Apr 2015 10:59:38 -0600 Subject: fix-waagent-service.patch No DEP3 Subject or Description header found Gbp-Pq: fix-waagent-service.patch. --- distro/systemd/waagent.service | 13 ------------- distro/systemd/walinuxagent.service | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 distro/systemd/waagent.service create mode 100644 distro/systemd/walinuxagent.service diff --git a/distro/systemd/waagent.service b/distro/systemd/waagent.service deleted file mode 100644 index a61fc9d..0000000 --- a/distro/systemd/waagent.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Windows Azure Linux Agent -After=network.target -After=sshd.service -ConditionFileIsExecutable=/usr/sbin/waagent -ConditionPathExists=/etc/waagent.conf - -[Service] -Type=simple -ExecStart=/usr/sbin/waagent -daemon - -[Install] -WantedBy=multi-user.target diff --git a/distro/systemd/walinuxagent.service b/distro/systemd/walinuxagent.service new file mode 100644 index 0000000..2438a0a --- /dev/null +++ b/distro/systemd/walinuxagent.service @@ -0,0 +1,14 @@ +[Unit] +Description=Windows Azure Linux Agent +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 +ConditionVirtualization=microsoft + +[Service] +Type=simple +ExecStart=/usr/sbin/waagent -daemon + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3