From: mhoellein <mario@hoellein.online>
Date: Fri, 27 Jan 2023 07:34:13 +0000 (+0100)
Subject: committing changes in /etc made by "apt-get upgrade"
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=5c5a2d40ca3e0549963ea0321d069138fb32be20;p=vserver

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

Package changes:
-ubuntu-advantage-tools 27.12~20.04.1 amd64
+ubuntu-advantage-tools 27.13.1~20.04.1 amd64
---

diff --git a/apt/apt.conf.d/20apt-esm-hook.conf b/apt/apt.conf.d/20apt-esm-hook.conf
index 07c336294..be60038bb 100644
--- a/apt/apt.conf.d/20apt-esm-hook.conf
+++ b/apt/apt.conf.d/20apt-esm-hook.conf
@@ -1,13 +1,9 @@
-APT::Update::Post-Invoke-Stats {
-	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-stats || true";
+APT::Update::Pre-Invoke {
+	"[ ! -e /run/systemd/system ] || systemctl start --no-block apt-news.service esm-cache.service || true";
 };
 
-APT::Install::Post-Invoke-Success {
-	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook post-invoke-success || true";
-}; 
-
-APT::Install::Pre-Invoke {
-	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook pre-invoke || 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 {
diff --git a/ubuntu-advantage/help_data.yaml b/ubuntu-advantage/help_data.yaml
index 45887d840..13bcb26df 100644
--- a/ubuntu-advantage/help_data.yaml
+++ b/ubuntu-advantage/help_data.yaml
@@ -62,11 +62,11 @@ livepatch:
 
 realtime-kernel:
   help: |
-    The real-time kernel is an Ubuntu kernel with PREEMPT_RT patches integrated.
+    The Real-time kernel is an Ubuntu kernel with PREEMPT_RT patches integrated.
     It services latency-dependent use cases by providing deterministic response times.
-    The real-time kernel meets stringent preemption specifications and is suitable for
+    The Real-time kernel meets stringent preemption specifications and is suitable for
     telco applications and dedicated devices in industrial automation and robotics.
-    The real-time kernel is currently incompatible with FIPS and Livepatch. 
+    The Real-time kernel is currently incompatible with FIPS and Livepatch. 
 
 ros:
   help: |
diff --git a/ubuntu-advantage/uaclient.conf b/ubuntu-advantage/uaclient.conf
index c5b5404c6..3bf107a58 100644
--- a/ubuntu-advantage/uaclient.conf
+++ b/ubuntu-advantage/uaclient.conf
@@ -15,5 +15,4 @@ ua_config:
   http_proxy: null
   https_proxy: null
   update_messaging_timer: 21600
-  update_status_timer: 43200
   metering_timer: 14400