summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBen Howard <ben.howard@ubuntu.com>2016-03-07 12:10:21 -0700
committerusd-importer <ubuntu-server@lists.ubuntu.com>2016-03-07 20:18:37 +0000
commit0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6 (patch)
tree284ff591c5df2833d224e9d1ac3a9c8e327adec6 /debian
parent9afda2f6662f4f90341109d5a8207d6fc14f8707 (diff)
downloadvyos-walinuxagent-0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6.tar.gz
vyos-walinuxagent-0f7cef5b52162d1ebb31a738bd8fc9febe1fbda6.zip
Import patches-unapplied version 2.1.3-0ubuntu4 to ubuntu/xenial-proposed
Imported using git-ubuntu import. Changelog parent: 9afda2f6662f4f90341109d5a8207d6fc14f8707 New changelog entries: * Correct ephemeral warning to include the full command for removal (LP: #1554186).
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/ephemeral-disk-warning.conf5
-rwxr-xr-xdebian/ephemeral-disk-warning.sh5
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