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

chore: remove unneeded workaround for capabilities #65

Merged
merged 1 commit into from
Dec 30, 2024

Conversation

ledif
Copy link
Collaborator

@ledif ledif commented Dec 29, 2024

Capabilities can be set in the Containerfile directly. This workaround has been removed in Bazzite (ublue-os/bazzite@c47e125) in favor of setting caps directly.

I manually tested and confirmed the capabilities are still the same using aurora-dx in a VM.

Before

❯ getcap /usr/libexec/ksysguard/ksgrd_network_helper
/usr/libexec/ksysguard/ksgrd_network_helper cap_net_raw=ep

❯ systemctl status kde-sysmonitor-workaround.service
● kde-sysmonitor-workaround.service - Workaround KDE System Monitor not having the correct caps
     Loaded: loaded (/usr/lib/systemd/system/kde-sysmonitor-workaround.service; enabled; preset: disabled)
    Drop-In: /usr/lib/systemd/system/service.d
             └─10-timeout-abort.conf, 50-keep-warm.conf
     Active: active (exited) since Sun 2024-12-29 12:54:08 CST; 51min ago
 Invocation: a6ee1a1f62ac4108875cfce529fe3aef
    Process: 1331 ExecStartPre=/usr/bin/bash -c [ -x /usr/local/libexec/.ksysguard/ksgrd_network_helper ] || /usr/bin/cp /us>
    Process: 1361 ExecStartPre=/usr/bin/mount --bind /usr/local/libexec/.ksysguard/ksgrd_network_helper /usr/libexec/ksysgua>
    Process: 1378 ExecStart=/usr/sbin/setcap cap_net_raw+ep /usr/libexec/ksysguard/ksgrd_network_helper (code=exited, status>
   Main PID: 1378 (code=exited, status=0/SUCCESS)
   Mem peak: 1.2M
        CPU: 11ms

After

❯ getcap /usr/libexec/ksysguard/ksgrd_network_helper
/usr/libexec/ksysguard/ksgrd_network_helper cap_net_raw=ep

❯ systemctl status kde-sysmonitor-workaround.service
Unit kde-sysmonitor-workaround.service could not be found.

@ledif ledif requested a review from castrojo as a code owner December 29, 2024 20:50
@RealVishy RealVishy added this pull request to the merge queue Dec 30, 2024
Merged via the queue into ublue-os:main with commit 0cd63da Dec 30, 2024
26 checks passed
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