feat(profile): merge resolvectl and systemd-resolve.

apparmor.d/groups/systemd/resolvectl

@@ -7,11 +7,17 @@ abi <abi/4.0>,
 include <tunables/global>
 
 @{exec_path} = @{bin}/resolvectl
-profile resolvectl @{exec_path} {
+profile resolvectl @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
-  include <abstractions/consoles>
   include <abstractions/bus-system>
   include <abstractions/common/systemd>
+  include <abstractions/consoles>
+
+  capability net_admin,
+
+  network inet raw,
+  network inet6 raw,
+  network netlink raw, 
 
   signal send set=cont peer=child-pager,
 

apparmor.d/groups/systemd/systemd-resolve

@@ -1,27 +0,0 @@
-# apparmor.d - Full set of apparmor profiles
-# Copyright (C) 2021-2024 Alexandre Pujol <alexandre@pujol.io>
-# SPDX-License-Identifier: GPL-2.0-only
-
-abi <abi/4.0>,
-
-include <tunables/global>
-
-@{exec_path} = @{bin}/resolvectl
-@{exec_path} += @{bin}/systemd-resolve
-profile systemd-resolve @{exec_path} {
-  include <abstractions/base>
-
-  capability mknod,
-  capability net_admin,
-
-  network netlink raw,
-
-  @{exec_path} mr,
-
-        @{PROC}/ r,
-  owner @{PROC}/@{pids}/fd/ r,
-
-  include if exists <local/systemd-resolve>
-}
-
-# vim:syntax=apparmor

dists/flags/main.flags

@@ -362,7 +362,6 @@ systemd-network-generator attach_disconnected,complain
 systemd-nsresourced attach_disconnected,complain
 systemd-nsresourcework complain
 systemd-portabled complain
-systemd-resolve complain
 systemd-shutdown complain
 systemd-sleep-tlp complain
 systemd-socket-proxyd complain