refractor(dbus): use the new bus-{systemd,session} abstractions.

2023-12-06 21:56:59 +00:00 · 2023-12-06 21:56:59 +00:00 · 1cf268b770
commit 1cf268b770
parent 9861f005d4
187 changed files with 288 additions and 287 deletions
--- a/apparmor.d/groups/systemd/hostnamectl
+++ b/apparmor.d/groups/systemd/hostnamectl
@ -9,9 +9,9 @@ include <tunables/global>
@{exec_path} = @{bin}/hostnamectl
 profile hostnamectl @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.hostname1>
  include <abstractions/consoles>
-  include <abstractions/dbus-strict>

  capability net_admin,

--- a/apparmor.d/groups/systemd/loginctl
+++ b/apparmor.d/groups/systemd/loginctl
@ -9,9 +9,9 @@ include <tunables/global>
@{exec_path} = @{bin}/loginctl
 profile loginctl @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.login1.Session>
  include <abstractions/bus/org.freedesktop.login1>
-  include <abstractions/dbus-strict>
  include <abstractions/systemd-common>

  capability net_admin,
--- a/apparmor.d/groups/systemd/networkctl
+++ b/apparmor.d/groups/systemd/networkctl
@ -10,7 +10,7 @@ include <tunables/global>
@{exec_path} = @{bin}/networkctl
 profile networkctl @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>

  capability net_admin,
  capability sys_module,
--- a/apparmor.d/groups/systemd/systemd-analyze
+++ b/apparmor.d/groups/systemd/systemd-analyze
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{bin}/systemd-analyze
 profile systemd-analyze @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/consoles>
-  include <abstractions/dbus-strict>
  include <abstractions/systemd-common>

  capability sys_resource,
--- a/apparmor.d/groups/systemd/systemd-homed
+++ b/apparmor.d/groups/systemd/systemd-homed
@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-homed
 profile systemd-homed @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>
  include <abstractions/disks-write>
  include <abstractions/nameservice-strict>
  include <abstractions/openssl>
--- a/apparmor.d/groups/systemd/systemd-hostnamed
+++ b/apparmor.d/groups/systemd/systemd-hostnamed
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-hostnamed
 profile systemd-hostnamed @{exec_path}  flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.PolicyKit1>
-  include <abstractions/dbus-strict>
  include <abstractions/systemd-common>

  capability sys_admin,  # To set a hostname
--- a/apparmor.d/groups/systemd/systemd-localed
+++ b/apparmor.d/groups/systemd/systemd-localed
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-localed
 profile systemd-localed @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/consoles>
-  include <abstractions/dbus-strict>
  include <abstractions/systemd-common>

  # Needed?
--- a/apparmor.d/groups/systemd/systemd-logind
+++ b/apparmor.d/groups/systemd/systemd-logind
@ -10,9 +10,9 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-logind
 profile systemd-logind @{exec_path} flags=(attach_disconnected,complain) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.PolicyKit1>
  include <abstractions/consoles>
-  include <abstractions/dbus-strict>
  include <abstractions/devices-usb>
  include <abstractions/disks-write>
  include <abstractions/nameservice-strict>
--- a/apparmor.d/groups/systemd/systemd-machined
+++ b/apparmor.d/groups/systemd/systemd-machined
@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-machined
 profile systemd-machined @{exec_path} {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>
  include <abstractions/systemd-common>

  capability chown,
--- a/apparmor.d/groups/systemd/systemd-networkd
+++ b/apparmor.d/groups/systemd/systemd-networkd
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-networkd
 profile systemd-networkd @{exec_path} flags=(attach_disconnected,complain) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.hostname1>
-  include <abstractions/dbus-strict>
  include <abstractions/systemd-common>

  capability net_admin,
--- a/apparmor.d/groups/systemd/systemd-oomd
+++ b/apparmor.d/groups/systemd/systemd-oomd
@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-oomd
 profile systemd-oomd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>
  include <abstractions/systemd-common>

  capability dac_override,
--- a/apparmor.d/groups/systemd/systemd-resolved
+++ b/apparmor.d/groups/systemd/systemd-resolved
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-resolved
 profile systemd-resolved @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.login1>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/openssl>
  include <abstractions/p11-kit>
--- a/apparmor.d/groups/systemd/systemd-sleep
+++ b/apparmor.d/groups/systemd/systemd-sleep
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-sleep
 profile systemd-sleep @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/nameservice-strict>
-  include <abstractions/dbus-strict>
  include <abstractions/systemd-common>

  capability net_admin,
--- a/apparmor.d/groups/systemd/systemd-timedated
+++ b/apparmor.d/groups/systemd/systemd-timedated
@ -10,7 +10,7 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-timedated
 profile systemd-timedated @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>
  include <abstractions/systemd-common>

  capability sys_time,
--- a/apparmor.d/groups/systemd/systemd-timesyncd
+++ b/apparmor.d/groups/systemd/systemd-timesyncd
@ -10,7 +10,7 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-timesyncd
 profile systemd-timesyncd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>
  include <abstractions/nameservice-strict>
  include <abstractions/systemd-common>

--- a/apparmor.d/groups/systemd/systemd-user-runtime-dir
+++ b/apparmor.d/groups/systemd/systemd-user-runtime-dir
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{lib}/systemd/systemd-user-runtime-dir
 profile systemd-user-runtime-dir @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.login1>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/systemd-common>