From e49fda3313d8abf4f699ab0ffdd6c326b5fb591b Mon Sep 17 00:00:00 2001 From: mhoellein Date: Tue, 31 Jan 2023 11:42:09 +0100 Subject: [PATCH] committing changes in /etc after apt run Package changes: -krb5-locales 1.16-2ubuntu0.2 all +krb5-locales 1.16-2ubuntu0.3 all -libgssapi-krb5-2 1.16-2ubuntu0.2 amd64 -libgssapi-krb5-2 1.16-2ubuntu0.2 i386 +libgssapi-krb5-2 1.16-2ubuntu0.3 amd64 +libgssapi-krb5-2 1.16-2ubuntu0.3 i386 -libk5crypto3 1.16-2ubuntu0.2 amd64 -libk5crypto3 1.16-2ubuntu0.2 i386 +libk5crypto3 1.16-2ubuntu0.3 amd64 +libk5crypto3 1.16-2ubuntu0.3 i386 -libkrb5-3 1.16-2ubuntu0.2 amd64 -libkrb5-3 1.16-2ubuntu0.2 i386 -libkrb5support0 1.16-2ubuntu0.2 amd64 -libkrb5support0 1.16-2ubuntu0.2 i386 +libkrb5-3 1.16-2ubuntu0.3 amd64 +libkrb5-3 1.16-2ubuntu0.3 i386 +libkrb5support0 1.16-2ubuntu0.3 amd64 +libkrb5support0 1.16-2ubuntu0.3 i386 -libmysqlclient20 5.7.40-0ubuntu0.18.04.1 amd64 +libmysqlclient20 5.7.41-0ubuntu0.18.04.1 amd64 -libpam-modules 1.1.8-3.6ubuntu2.18.04.3 amd64 -libpam-modules-bin 1.1.8-3.6ubuntu2.18.04.3 amd64 -libpam-runtime 1.1.8-3.6ubuntu2.18.04.3 all +libpam-modules 1.1.8-3.6ubuntu2.18.04.4 amd64 +libpam-modules-bin 1.1.8-3.6ubuntu2.18.04.4 amd64 +libpam-runtime 1.1.8-3.6ubuntu2.18.04.4 all -libpam0g 1.1.8-3.6ubuntu2.18.04.3 amd64 +libpam0g 1.1.8-3.6ubuntu2.18.04.4 amd64 -privoxy 3.0.26-5ubuntu0.1 amd64 +privoxy 3.0.26-5ubuntu0.3 amd64 -python-pip 9.0.1-2.3~ubuntu1.18.04.5 all -python-pip-whl 9.0.1-2.3~ubuntu1.18.04.5 all +python-pip 9.0.1-2.3~ubuntu1.18.04.6 all +python-pip-whl 9.0.1-2.3~ubuntu1.18.04.6 all -ubuntu-advantage-tools 27.12~18.04.1 amd64 +ubuntu-advantage-tools 27.13.2~18.04.1 amd64 --- apt/apt.conf.d/20apt-esm-hook.conf | 12 ++++-------- ubuntu-advantage/help_data.yaml | 6 +++--- ubuntu-advantage/uaclient.conf | 1 - 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/apt/apt.conf.d/20apt-esm-hook.conf b/apt/apt.conf.d/20apt-esm-hook.conf index 07c33629..7bcae444 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 ] || [ $(id -u) -ne 0 ] || 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 45887d84..13bcb26d 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 c5b5404c..3bf107a5 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 -- 2.43.0