Merge ~renanrodrigo/update-notifier:file-based-motd-disable-noble into update-notifier:master

[Renan Rodrigo]

update-motd: use a marker file to hide esm updates information

Instead of a flag passed to the script, check for the existence of a marker file. This implements the same control level for any caller of the update-motd script.

[Renan Rodrigo (renanrodrigo)]

The marker file could live in /var/lib/update-notifier/ instead of /var/lib/ubuntu-advantage/. In my initial idea, we would also make use of this file in the Pro Client. Now I see there is no need to (as I baked it into the udpate-motd-updates-available script itself...). Please let me know if you think it's better to check for a file in the update-notifier folder instead.

[Nick Rosbrook (enr0n)]

I left a couple comments inline.

review: Needs Fixing

[Renan Rodrigo (renanrodrigo)]

Changes made. Will soon update the other branches too.

[Nick Rosbrook (enr0n)]

LGTM. Thanks!

review: Approve

diff --git a/data/update-motd-updates-available b/data/update-motd-updates-available
index 8148654..5f3e9b5 100755
--- a/data/update-motd-updates-available
+++ b/data/update-motd-updates-available
@@ -2,25 +2,14 @@
 #
 # helper for update-motd
 
-NEED_UPDATE_CHECK="no"
 NO_ESM_MESSAGES=""
 
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    # poor mans force
-    --force)
-      NEED_UPDATE_CHECK="yes"
-      shift
-      ;;
-    --no-esm-messages)
-      NO_ESM_MESSAGES="--no-esm-messages"
-      shift
-      ;;
-    *)
-      shift
-      ;;
-  esac
-done
+# poor mans force
+if [ "$1" = "--force" ]; then
+    NEED_UPDATE_CHECK=yes
+else
+    NEED_UPDATE_CHECK=no
+fi
 
 # check time when we did the last update check
 stamp="/var/lib/update-notifier/updates-available"
@@ -59,6 +48,12 @@ tmpfile=""
 trap cleanup EXIT
 tmpfile=$(mktemp -p $(dirname "$stamp"))
 
+# should we hide esm-related information in the output
+no_esm_file="/var/lib/update-notifier/hide-esm-in-motd"
+if [ -e "$no_esm_file" ]; then
+    NO_ESM_MESSAGES="--no-esm-messages"
+fi
+
 # output something for update-motd
 if [ "$NEED_UPDATE_CHECK" = "yes" ]; then
     {
diff --git a/debian/changelog b/debian/changelog
index 0e8e1f6..c8c71e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+update-notifier (3.192.68) noble; urgency=medium
+
+  * update-motd: use a marker file to hide ESM messages (LP: #2015420)
+
+ -- Renan Rodrigo Barbosa <[e-mail]>  Mon, 04 Mar 2024 07:18:35 -0300
+
 update-notifier (3.192.67) noble; urgency=medium
 
   * apt-check: add option to hide ESM messages from the human readable output.