summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2014-11-07 07:02:18 -0700
committerusd-importer <ubuntu-server@lists.ubuntu.com>2014-11-07 17:08:36 +0000
commite5815bd0c9096099b3da92b69578f0afb1066ce4 (patch)
tree659b0771d701d195e0babfa24e7669c7a9b164c3
parent7c19244725bac484f17669de0ccfd2dac4bf272d (diff)
downloadvyos-walinuxagent-e5815bd0c9096099b3da92b69578f0afb1066ce4.tar.gz
vyos-walinuxagent-e5815bd0c9096099b3da92b69578f0afb1066ce4.zip
Import patches-unapplied version 2.0.8-0ubuntu3 to ubuntu/vivid-proposed
Imported using git-ubuntu import. Changelog parent: 7c19244725bac484f17669de0ccfd2dac4bf272d New changelog entries: * Changed startup ordering to on ephemeral disk warning as the warning is not written on first boot.
-rw-r--r--debian/changelog7
-rw-r--r--debian/ephemeral-disk-warning.conf2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 7654706..e2b5bce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+walinuxagent (2.0.8-0ubuntu3) vivid; urgency=medium
+
+ * Changed startup ordering to on ephemeral disk warning as the warning
+ is not written on first boot.
+
+ -- Ben Howard <ben.howard@ubuntu.com> Fri, 07 Nov 2014 07:02:18 -0700
+
walinuxagent (2.0.8-0ubuntu2) vivid; urgency=medium
* Add upstart job to add "readme" on Azure ephemeral disk (LP: #1382257).
diff --git a/debian/ephemeral-disk-warning.conf b/debian/ephemeral-disk-warning.conf
index 2081381..714ee99 100644
--- a/debian/ephemeral-disk-warning.conf
+++ b/debian/ephemeral-disk-warning.conf
@@ -4,7 +4,7 @@
# unsafe between boots. This places a file on /mnt that warns the user
# that the disk is a dangerous place for storing data of any importance.
-start on (mounted MOUNTPOINT=/mnt and started cloud-final)
+start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config)
task
script
dev_sdb_mp=$(mount | awk '/sdb1/{print$3}')