From 325a43b8bf4b1d8e9f02848423c3b19c3ad8071d Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 9 Nov 2015 08:38:28 -0700 Subject: Import patches-unapplied version 2.1.1-0ubuntu4 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 33844ef406f0c499eb703dfa9d1e44554be0375e New changelog entries: * Added d/azure-resource as initramfs hook (LP: #1514485). --- debian/azure-resource | 22 ++++++++++++++++++++++ debian/changelog | 6 ++++++ debian/install | 1 + debian/postinst | 5 +++++ 4 files changed, 34 insertions(+) create mode 100755 debian/azure-resource diff --git a/debian/azure-resource b/debian/azure-resource new file mode 100755 index 0000000..4977e3d --- /dev/null +++ b/debian/azure-resource @@ -0,0 +1,22 @@ +#!/bin/sh + +PREREQ="udev" + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +prereqs) + prereqs + exit 0 + ;; +esac + +mkdir -p $DESTDIR/lib/udev/rules.d/ +if [ -e /etc/udev/rules.d/66-azure-storage.rules ]; then + cp -pt "${DESTDIR}/lib/udev/rules.d" /etc/udev/rules.d/66-azure-storage.rules +elif [ -e /lib/udev/rules.d/66-azure-storage.rules ]; then + cp -pt "${DESTDIR}/lib/udev/rules.d" /lib/udev/rules.d/66-azure-storage.rules +fi diff --git a/debian/changelog b/debian/changelog index a90e7d1..f47e8c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +walinuxagent (2.1.1-0ubuntu4) xenial; urgency=medium + + * Added d/azure-resource as initramfs hook (LP: #1514485). + + -- Ben Howard Mon, 09 Nov 2015 08:38:28 -0700 + walinuxagent (2.1.1-0ubuntu3) wily; urgency=medium * Fix typo in d/rules preventing systemd jobs from being enabled (LP: diff --git a/debian/install b/debian/install index 5f441de..8b6f616 100644 --- a/debian/install +++ b/debian/install @@ -3,3 +3,4 @@ debian/ephemeral-disk-warning.service lib/systemd/system debian/ephemeral-disk-warning.conf etc/init debian/ephemeral-disk-warning.sh usr/sbin debian/66-azure-storage.rules lib/udev/rules.d +debian/azure-resource usr/share/initramfs-tools/hooks diff --git a/debian/postinst b/debian/postinst index fd2aa15..759c856 100644 --- a/debian/postinst +++ b/debian/postinst @@ -4,6 +4,11 @@ set -e if [ "$1" = "configure" ]; then # fix for LP: 1268050 sed -i 's|^send host-name "";|send host-name = gethostname();|g' /etc/dhcp/dhclient.conf + + # Trigger update for initramfs (LP: #1514485). + [ -x /usr/sbin/update-initramfs ] && update-initramfs -u + [ -x /etc/kernel/postinst.d/dracut ] && /etc/kernel/postinst.d/dracut $(uname -r) + fi #DEBHELPER# -- cgit v1.2.3 From 6b8919a7c25a03d704fd522179b4c0d1d99a5797 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 9 Nov 2015 08:38:28 -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 044da46bfa995ba424abc007b5b4c8dfe447f5a6 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 9 Nov 2015 08:38:28 -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 76afc31d4b16bea44b318cf2bb9355520e977817 Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 9 Nov 2015 08:38:28 -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 51908b51cc828e243b8006e8cee3d3f894cc3dac Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 9 Nov 2015 08:38:28 -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