ubuntu/+source/ubuntu-advantage-tools:ubuntu/xenial-proposed

Last commit made on 2024-04-05
Get this branch:
git clone -b ubuntu/xenial-proposed https://git.launchpad.net/ubuntu/+source/ubuntu-advantage-tools
Members of git-ubuntu import can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
ubuntu/xenial-proposed
Repository:
lp:ubuntu/+source/ubuntu-advantage-tools

Recent commits

f07ec10... by Lucas Albuquerque Medeiros de Moura

changelog backport to xenial

c6f0709... by Lucas Albuquerque Medeiros de Moura

Add changelog entry for 31.2.3

edfebf0... by Lucas Albuquerque Medeiros de Moura

bump version to 31.2.3

5bc0887... by Lucas Albuquerque Medeiros de Moura

daemon: remove unnecessary None check for state

We had a check to see if the cloud-config.service is not None,
which is redundant given the logic we have in place

c85a026... by Catherine Redfield

fix: wait for cloud-init.service to fully activate (#3021)

Once the systemd constraint on After cloud-config.service was
removed, there are situations where cloud-config.service runs so
long after pro that the python code that waits for
cloud-config.service to finish activating is being bypassed as if
cloud-init isn't on the system. This change forces pro to wait
for cloud-config to finish if cloud-init is running at all.

Fixes: #3000
LP: #2059952

656f3dd... by Steve Langasek

31.2.2build1 (patches unapplied)

Imported using git-ubuntu import.

443a733... by Andreas Hasenack

changelog for 31.2.2

eaf6045... by Andreas Hasenack

version.py: bump version to 31.2.2 (missed 31.2.1 before)

cbb76ad... by Andreas Hasenack

changelog

d11e9c0... by Andreas Hasenack

apt-news.service: ignore apparmor errors when starting

It's possible to have a system where apparmor is enabled, but no profile
is loaded. This happens when the user removed the apparmor debian
package. In that situation, the ubuntu_pro_apt_news profile will not be
loaded into the kernel at startup, and systemd will fail to apply it to
the service when starting.

Systemd already ignores the apparmor setting when apparmor is disabled,
but in this situation it is still enabled. The fix is to configure the
service to also ignore errors when apparmor is enabled.

The drawback is that the service might run unconfined now if there are
problems applying the selected apparmor profile on startup.

Fixes: #3002
LP: #2057937