diff --git a/apparmor.d/groups/systemd/systemd-xdg-autostart-generator b/apparmor.d/groups/systemd/systemd-xdg-autostart-generator index add15a2be..1d3c2856d 100644 --- a/apparmor.d/groups/systemd/systemd-xdg-autostart-generator +++ b/apparmor.d/groups/systemd/systemd-xdg-autostart-generator @@ -6,7 +6,7 @@ abi , include -@{exec_path} = /{usr/,}lib/systemd/user-generators/systemd-xdg-autostart-generator +@{exec_path} = @{lib}/systemd/user-generators/systemd-xdg-autostart-generator profile systemd-xdg-autostart-generator @{exec_path} { include include diff --git a/docs/development/guidelines.md b/docs/development/guidelines.md index fe25908b1..7a8427291 100644 --- a/docs/development/guidelines.md +++ b/docs/development/guidelines.md @@ -64,7 +64,7 @@ The file block should be sorted as follow: | Order | Description | Example | Link | |:-----:|:-----------:|:-------:|:------:| | **1** | The entry point of the profile | `@{exec_path} mr,` | [:octicons-link-external-24:](https://github.com/roddhjav/apparmor.d/blob/2e4788c51ef73798c0ac94993af3cd769723e8e4/apparmor.d/groups/gnome/gdm#L67) | -| **2** | The binaries and library required | `/{usr/,}bin/`, `/{usr/,}lib/`, `/opt/`. It is the only place where you can have `mr`, `rix`, `rPx`, `rUx`, `rPUX` rules. | [:octicons-link-external-24:](https://github.com/roddhjav/apparmor.d/blob/2e4788c51ef73798c0ac94993af3cd769723e8e4/apparmor.d/groups/gnome/gdm#L69-L76) | +| **2** | The binaries and library required | `@{bin}/`, `@{lib}/`, `/opt/`. It is the only place where you can have `mr`, `rix`, `rPx`, `rUx`, `rPUX` rules. | [:octicons-link-external-24:](https://github.com/roddhjav/apparmor.d/blob/2e4788c51ef73798c0ac94993af3cd769723e8e4/apparmor.d/groups/gnome/gdm#L69-L76) | | **3** | The shared resources | `/usr/share` | [:octicons-link-external-24:](https://github.com/roddhjav/apparmor.d/blob/2e4788c51ef73798c0ac94993af3cd769723e8e4/apparmor.d/groups/network/NetworkManager#L111-L120) | | **4** | The system configuration | `/etc` | [:octicons-link-external-24:](https://github.com/roddhjav/apparmor.d/blob/2e4788c51ef73798c0ac94993af3cd769723e8e4/apparmor.d/groups/network/NetworkManager#L111-L120) | | **5** | The system data | `/`, `/var`, `/boot` | [:octicons-link-external-24:](https://github.com/roddhjav/apparmor.d/blob/2e4788c51ef73798c0ac94993af3cd769723e8e4/apparmor.d/groups/gnome/tracker-extract#L83-L93) | @@ -97,8 +97,8 @@ If there is no predictable label it can be omitted. `bin, sbin & lib` -: - Do not use: `/usr/lib` or `/usr/bin` but `/{usr/,}bin/` or `/{usr/,}lib/` - - Do not use: `/usr/sbin` or `/sbin` but `/{usr/,}{s,}bin/`. +: - Do not use: `/usr/lib` or `/usr/bin` but `@{bin}/` or `@{lib}/` + - Do not use: `/usr/sbin` or `/sbin` but `@{bin}/`. `Variables`