diff options
author | Ben Howard <ben.howard@ubuntu.com> | 2014-11-07 07:02:18 -0700 |
---|---|---|
committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2014-11-07 17:08:36 +0000 |
commit | 528a618da56f0f1bb295af9e6c957b0b89bd630f (patch) | |
tree | b0bffdcdd9d735aaf6c0fe0243fef55f4883ce15 | |
parent | c524208c24e275e551d96c342ef3e2c2dfa8ef38 (diff) | |
parent | 58d2ba7c98a5e3cdeff16db85e90855218f3d10a (diff) | |
download | vyos-walinuxagent-528a618da56f0f1bb295af9e6c957b0b89bd630f.tar.gz vyos-walinuxagent-528a618da56f0f1bb295af9e6c957b0b89bd630f.zip |
Import patches-applied version 2.0.8-0ubuntu3 to applied/ubuntu/vivid-proposed
Imported using git-ubuntu import.
Changelog parent: c524208c24e275e551d96c342ef3e2c2dfa8ef38
Unapplied parent: 58d2ba7c98a5e3cdeff16db85e90855218f3d10a
New changelog entries:
* Changed startup ordering to on ephemeral disk warning as the warning
is not written on first boot.
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/ephemeral-disk-warning.conf | 2 |
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}') |