Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools: Add AppArmor profile for cockpit-desktop #20156

Merged
merged 1 commit into from
Mar 12, 2024

Conversation

martinpitt
Copy link
Member

Ubuntu 24.04 LTS restricts user name spaces by default. Add an AppArmor profile for cockpit-desktop to allow it. This is a no-op for older releases.

See https://launchpad.net/bugs/2046477 for details.


Blocks cockpit-project/bots#6048

Ubuntu 24.04 LTS restricts user name spaces by default. Add an AppArmor
profile for cockpit-desktop to allow it. This is a no-op for older
releases.

See https://launchpad.net/bugs/2046477 for details.
Copy link
Member

@allisonkarlitskaya allisonkarlitskaya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm OK with this, but I wonder if we should have rather placed that file 'downstream' (ie: inside of the packaging, and not part of make install)

@martinpitt
Copy link
Member Author

@allisonkarlitskaya that's what I did. EXTRA_DIST != "make install", it just needs to end up in the tarball.

@martinpitt
Copy link
Member Author

Ah, I think you meant put the whole policy into tools/debian/ ... Hm, maybe, but other distros like openSUSE have AppArmor as well. I thought tools/ would be harmless enough for that.

Anyway, I'll land it, so that we can unbreak it in tomorrow's release.

@martinpitt martinpitt merged commit 5659be3 into cockpit-project:main Mar 12, 2024
74 checks passed
@martinpitt martinpitt deleted the apparmor branch March 12, 2024 15:14
@jradxl
Copy link

jradxl commented Apr 5, 2024

In case this is of significance, I report it...
I have used your make-deb script on Ubuntu 22.04 to build latest version 314.
Once installed a new file /etc/apparmor.d/cockpit-desktop is added.
On the next reboot, the apparmor service does not start

aa-complain /usr/lib/cockpit/cockpit-desktop
ERROR: Syntax Error: Unknown line found in file /etc/apparmor.d/cockpit-desktop line 6:
userns,

Work around is to remove this file and restart apparmor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants