committing changes in /etc made by "apt-get upgrade"

Packages with configuration changes:
-ubuntu-advantage-tools 27.13.6~22.04.1 amd64
+ubuntu-advantage-tools 27.14.4~22.04 amd64

Package changes:
-apt 2.4.8 amd64
+apt 2.4.9 amd64
-apt-transport-https 2.4.8 all
-apt-utils 2.4.8 amd64
+apt-transport-https 2.4.9 all
+apt-utils 2.4.9 amd64
-libapt-pkg6.0 2.4.8 amd64
+libapt-pkg6.0 2.4.9 amd64
-libxml2 2.9.13+dfsg-1ubuntu0.2 amd64
+libxml2 2.9.13+dfsg-1ubuntu0.3 amd64
-postfix 3.6.4-1ubuntu1 amd64
+postfix 3.6.4-1ubuntu1.1 amd64
-tzdata 2022g-0ubuntu0.22.04.1 all
-ubuntu-advantage-tools 27.13.6~22.04.1 amd64
+tzdata 2023c-0ubuntu0.22.04.0 all
+ubuntu-advantage-tools 27.14.4~22.04 amd64
-vim 2:8.2.3995-1ubuntu2.5 amd64
+vim 2:8.2.3995-1ubuntu2.7 amd64
-vim-common 2:8.2.3995-1ubuntu2.5 all
+vim-common 2:8.2.3995-1ubuntu2.7 all
-vim-runtime 2:8.2.3995-1ubuntu2.5 all
-vim-tiny 2:8.2.3995-1ubuntu2.5 amd64
+vim-runtime 2:8.2.3995-1ubuntu2.7 all
+vim-tiny 2:8.2.3995-1ubuntu2.7 amd64
-xxd 2:8.2.3995-1ubuntu2.5 amd64
+xxd 2:8.2.3995-1ubuntu2.7 amd64

diff --git a/.etckeeper b/.etckeeper
index acbe6ea553cf527b725036ce0646f10796836d19..21c5f2c244062a95b3aa97390693011087f91627 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1613,7 +1613,6 @@ maybe chmod 0755 'update-motd.d'
 maybe chmod 0755 'update-motd.d/00-header'
 maybe chmod 0755 'update-motd.d/10-help-text'
 maybe chmod 0755 'update-motd.d/50-motd-news'
-maybe chmod 0755 'update-motd.d/88-esm-announce'
 maybe chmod 0755 'update-motd.d/91-contract-ua-esm-status'
 maybe chmod 0755 'update-motd.d/91-release-upgrade'
 maybe chmod 0644 'updatedb.conf'

diff --git a/apt/apt.conf.d/20apt-esm-hook.conf b/apt/apt.conf.d/20apt-esm-hook.conf
index 7bcae444bbdc50d38c39f429757e0d09f0af62ac..36a75937c2fb3494978a0dc19eb26921ea8e81ce 100644 (file)
--- a/apt/apt.conf.d/20apt-esm-hook.conf
+++ b/apt/apt.conf.d/20apt-esm-hook.conf
@@ -2,10 +2,6 @@ APT::Update::Pre-Invoke {
        "[ ! -e /run/systemd/system ] || [ $(id -u) -ne 0 ] || systemctl start --no-block apt-news.service esm-cache.service || true";
 };
 
-APT::Update::Post-Invoke-Stats {
-       "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook || true";
-};
-
 binary::apt::AptCli::Hooks::Upgrade {
        "[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true";
 };

diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf
index 3bf107a58ed38c28c9c482b854339bf7e63cdc45..6499bf13c57f4a83d016831dc2f74de10b01b3c6 100644 (file)
--- a/ubuntu-advantage/uaclient.conf
+++ b/ubuntu-advantage/uaclient.conf
@@ -1,18 +1,2 @@
-# Ubuntu Pro Client config file.
-# If you modify this file, run "pro refresh config" to ensure changes are
-# picked up by Ubuntu Pro Client.
-
 contract_url: https://contracts.canonical.com
-data_dir: /var/lib/ubuntu-advantage
-log_file: /var/log/ubuntu-advantage.log
 log_level: debug
-security_url: https://ubuntu.com/security
-timer_log_file: /var/log/ubuntu-advantage-timer.log
-daemon_log_file: /var/log/ubuntu-advantage-daemon.log
-ua_config:
-  apt_http_proxy: null
-  apt_https_proxy: null
-  http_proxy: null
-  https_proxy: null
-  update_messaging_timer: 21600
-  metering_timer: 14400

diff --git a/update-motd.d/88-esm-announce b/update-motd.d/88-esm-announce
deleted file mode 100755 (executable)
index 44b521b..0000000
--- a/update-motd.d/88-esm-announce
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-stamp="/var/lib/ubuntu-advantage/messages/motd-esm-announce"
-
-[ ! -r "$stamp" ] || cat "$stamp"

diff --git a/update-motd.d/91-contract-ua-esm-status b/update-motd.d/91-contract-ua-esm-status
index cc823340c157f7b863b6b2da6d653483de19a620..cfc6bb22f007b8340ed2b6b82906e0b61a889178 100755 (executable)
--- a/update-motd.d/91-contract-ua-esm-status
+++ b/update-motd.d/91-contract-ua-esm-status
@@ -1,7 +1,7 @@
 #!/bin/sh
-esm_stamp="/var/lib/ubuntu-advantage/messages/motd-esm-service-status"
+contract_status_stamp="/var/lib/ubuntu-advantage/messages/motd-contract-status"
 
-[ ! -r "$esm_stamp" ] || cat "$esm_stamp"
+[ ! -r "$contract_status_stamp" ] || cat "$contract_status_stamp"
 
 auto_attach_stamp="/var/lib/ubuntu-advantage/messages/motd-auto-attach-status"