summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2015-11-09 08:38:28 -0700
committerusd-importer <ubuntu-server@lists.ubuntu.com>2015-11-09 16:53:49 +0000
commit325a43b8bf4b1d8e9f02848423c3b19c3ad8071d (patch)
tree5481a5200b3e7a1fed08ab9d838c6023cbf753ae /debian
parent33844ef406f0c499eb703dfa9d1e44554be0375e (diff)
downloadvyos-walinuxagent-325a43b8bf4b1d8e9f02848423c3b19c3ad8071d.tar.gz
vyos-walinuxagent-325a43b8bf4b1d8e9f02848423c3b19c3ad8071d.zip
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).
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/azure-resource22
-rw-r--r--debian/changelog6
-rw-r--r--debian/install1
-rw-r--r--debian/postinst5
4 files changed, 34 insertions, 0 deletions
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 <ben.howard@ubuntu.com> 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 "<hostname>";|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#