diff options
| author | Ben Howard <ben.howard@ubuntu.com> | 2016-03-07 12:10:21 -0700 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2016-03-07 20:18:37 +0000 |
| commit | b0cb938c8bd00066ae0f3cdb9ecf0b1d7f2ca57e (patch) | |
| tree | eb25564b5225b509fcefefd371d84e8a5676f69a | |
| parent | 995626abfb54441366cee4f701744f83c87630b4 (diff) | |
| parent | f2c691f64e4a49472fa7dc7f1aea67a3488a7fe2 (diff) | |
| download | vyos-walinuxagent-b0cb938c8bd00066ae0f3cdb9ecf0b1d7f2ca57e.tar.gz vyos-walinuxagent-b0cb938c8bd00066ae0f3cdb9ecf0b1d7f2ca57e.zip | |
Import patches-applied version 2.1.3-0ubuntu4 to applied/ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: 995626abfb54441366cee4f701744f83c87630b4
Unapplied parent: f2c691f64e4a49472fa7dc7f1aea67a3488a7fe2
New changelog entries:
* Correct ephemeral warning to include the full command for removal
(LP: #1554186).
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/ephemeral-disk-warning.conf | 5 | ||||
| -rwxr-xr-x | debian/ephemeral-disk-warning.sh | 5 |
3 files changed, 17 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ccf5886..bdbae20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +walinuxagent (2.1.3-0ubuntu4) xenial; urgency=medium + + * Correct ephemeral warning to include the full command for removal + (LP: #1554186). + + -- Ben Howard <ben.howard@ubuntu.com> Mon, 07 Mar 2016 12:10:21 -0700 + walinuxagent (2.1.3-0ubuntu3) xenial; urgency=medium * Remove conflict with NetworkManager (LP: #1550461): diff --git a/debian/ephemeral-disk-warning.conf b/debian/ephemeral-disk-warning.conf index 39d54d1..7f60cfe 100644 --- a/debian/ephemeral-disk-warning.conf +++ b/debian/ephemeral-disk-warning.conf @@ -39,6 +39,11 @@ http://msdn.microsoft.com/en-us/library/windowsazure/jj672979.aspx To remove this warning run: sudo chattr -i $warn_file + sudo rm $warn_file + +This warning is written each boot; to disable it: + echo "manual" | sudo tee /etc/init/ephemeral-disk-warning.override + sudo systemctl disable ephemeral-disk-warning.service EOF chmod 0444 $warn_file diff --git a/debian/ephemeral-disk-warning.sh b/debian/ephemeral-disk-warning.sh index 3cc8f86..d497256 100755 --- a/debian/ephemeral-disk-warning.sh +++ b/debian/ephemeral-disk-warning.sh @@ -17,6 +17,11 @@ http://msdn.microsoft.com/en-us/library/windowsazure/jj672979.aspx To remove this warning run: sudo chattr -i $warn_file + sudo rm $warn_file + +This warning is written each boot; to disable it: + echo "manual" | sudo tee /etc/init/ephemeral-disk-warning.override + sudo systemctl disable ephemeral-disk-warning.service EOM |