Merge ~ahasenack/ubuntu/+source/ubuntu-advantage-tools:bionic-reorder-motd into ubuntu/+source/ubuntu-advantage-tools:ubuntu/devel

[Andreas Hasenack]

Move our motd scripts to an earlier place and leave the last positions for more urgent messages.

Before: https://pastebin.ubuntu.com/p/dnfjrmpSZH/
After: https://pastebin.ubuntu.com/p/C7dczsPc2H/

The new placement showed a small formatting problem in that double blank lines were showing up, so that was fixed too.

[Christian Ehrhardt  (paelzer)]

- Ack to the proposed changes (UI wise)
- Ack to the packaging changes (I was confused at the lack of a -install change, but the wildcard
  in the Makefile handles that)
- On upgrade files are correctly moved
- no other upgrade issues
- also good on a new install
- the (up to) 24h delay after remove/reinstall is known and ok
- new output looks good

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, can you please push the upload tag and dput? I'll watch excuses

[Christian Ehrhardt  (paelzer)]

Tag and dput done as requested

diff --git a/debian/changelog b/debian/changelog
index 0215a81..9c328f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ubuntu-advantage-tools (15) bionic; urgency=medium
+
+  * Rename motd scripts so they are shown a bit earlier (LP: #1757171)
+  * Move empty line placement in the livepatch motd to the beginning of the
+    message to avoid double blank lines.
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 20 Mar 2018 16:44:31 -0300
+
 ubuntu-advantage-tools (14) bionic; urgency=medium
 
   * New upstream release:
diff --git a/debian/ubuntu-advantage-tools.maintscript b/debian/ubuntu-advantage-tools.maintscript
new file mode 100644
index 0000000..5a8cb58
--- /dev/null
+++ b/debian/ubuntu-advantage-tools.maintscript
@@ -0,0 +1,2 @@
+mv_conffile /etc/update-motd.d/99-livepatch /etc/update-motd.d/80-livepatch 15~
+mv_conffile /etc/update-motd.d/99-esm /etc/update-motd.d/80-esm 15~
diff --git a/tests/test_livepatch_motd.py b/tests/test_livepatch_motd.py
index e3ef050..c8beeda 100644
--- a/tests/test_livepatch_motd.py
+++ b/tests/test_livepatch_motd.py
@@ -59,7 +59,7 @@ class LivepatchMOTDTest(UbuntuAdvantageTest):
     SERIES = 'trusty'
     ARCH = 'x86_64'
     KERNEL_VERSION = '4.4.0-89-generic'
-    SCRIPT = 'update-motd.d/99-livepatch'
+    SCRIPT = 'update-motd.d/80-livepatch'
 
     def setUp(self):
         super().setUp()
diff --git a/update-motd.d/99-esm b/update-motd.d/80-esm
index 0857621..0857621 100755
--- a/update-motd.d/99-esm
+++ b/update-motd.d/80-esm
diff --git a/update-motd.d/99-livepatch b/update-motd.d/80-livepatch
index b900449..de59bf1 100755
--- a/update-motd.d/99-livepatch
+++ b/update-motd.d/80-livepatch
@@ -74,20 +74,20 @@ case "$livepatch_status" in
         # do nothing
         ;;
     "enabled")
+        echo
         echo " * Canonical Livepatch is enabled."
         print_status "${check_state}" "${patch_state}"
-        echo
         ;;
     "disabled")
+        echo
         echo " * Canonical Livepatch is available for installation."
         echo "   - Reduce system reboots and improve kernel security. Activate at:"
         echo "     https://ubuntu.com/livepatch"
-        echo
         ;;
     *)
+        echo
         echo " * Canonical Livepatch is in an unknown state."
         echo "   - Please see /var/log/syslog for more information."
         echo "     Status: \"$livepatch_status\""
-        echo
         ;;
 esac