From 33844ef406f0c499eb703dfa9d1e44554be0375e Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 12 Oct 2015 13:33:16 -0700 Subject: Import patches-unapplied version 2.1.1-0ubuntu3 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: 88f6f4f0abd2e9e477504ca590d82c5728c9923b New changelog entries: * Fix typo in d/rules preventing systemd jobs from being enabled (LP: #1505384). --- debian/changelog | 7 +++++++ debian/rules | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6b2796e..a90e7d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +walinuxagent (2.1.1-0ubuntu3) wily; urgency=medium + + * Fix typo in d/rules preventing systemd jobs from being enabled (LP: + #1505384). + + -- Ben Howard Mon, 12 Oct 2015 13:33:16 -0700 + walinuxagent (2.1.1-0ubuntu2) wily; urgency=medium * Add support for upstart or systemd (LP: #1505001). diff --git a/debian/rules b/debian/rules index 56db7a2..81f338d 100755 --- a/debian/rules +++ b/debian/rules @@ -17,7 +17,9 @@ get-packaged-orig-source: override_dh_installinit: dh_installinit --no-restart-on-upgrade --name walinuxagent + dh_installinit --no-restart-on-upgrade --name ephemeral-disk-warning override_dh_systemd_enable: - dh_systemd_enable --name walinuxagent waxlinuxagent.service + dh_systemd_enable --name walinuxagent walinuxagent.service + dh_systemd_enable --name ephemeral-disk-warning ephemeral-disk-warning.service -- cgit v1.2.3 From 485689bdf3cfd4f0ad23a34d8c13389ba08436e3 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 12 Oct 2015 13:33:16 -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 26bf3b43f510c8b402aa86384d0915ad2877cd81 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 12 Oct 2015 13:33:16 -0700 Subject: start-after-cloudinit.patch No DEP3 Subject or Description header found Gbp-Pq: start-after-cloudinit.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 1a67835..e7780b8 100755 --- a/init/ubuntu/walinuxagent.service +++ b/init/ubuntu/walinuxagent.service @@ -1,7 +1,7 @@ [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 -- cgit v1.2.3 From de25555119bd7fd5b755c86b707e2e47dfb6ffa4 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 12 Oct 2015 13:33:16 -0700 Subject: disable-udev-rules-removal.patch No DEP3 Subject or Description header found Gbp-Pq: disable-udev-rules-removal.patch. --- azurelinuxagent/distro/ubuntu/osutil.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azurelinuxagent/distro/ubuntu/osutil.py b/azurelinuxagent/distro/ubuntu/osutil.py index 1e51c2a..dcd730c 100644 --- a/azurelinuxagent/distro/ubuntu/osutil.py +++ b/azurelinuxagent/distro/ubuntu/osutil.py @@ -44,6 +44,9 @@ class Ubuntu14xOSUtil(DefaultOSUtil): def start_agent_service(self): return shellutil.run("service walinuxagent start", chk_err=False) + def remove_rules_files(self, *args): + return + class Ubuntu1204OSUtil(Ubuntu14xOSUtil): def __init__(self): super(Ubuntu1204OSUtil, self).__init__() -- cgit v1.2.3 From 021bfefee3fe2cabb8b0cfc07c818a49e191cf7f Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 12 Oct 2015 13:33:16 -0700 Subject: disable-provisioning.patch No DEP3 Subject or Description header found Gbp-Pq: disable-provisioning.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 ab50418..3afb839 100644 --- a/config/ubuntu/waagent.conf +++ b/config/ubuntu/waagent.conf @@ -42,7 +42,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 -- cgit v1.2.3