From 2db6b12a9bde9a58baffce64c32a3666b7411a12 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 27 Aug 2023 14:42:13 +0100
Subject: [PATCH] chore: cosmetic on snap profiles.

---
 apparmor.d/profiles-s-z/snap            | 2 +-
 apparmor.d/profiles-s-z/snap-discard-ns | 2 +-
 apparmor.d/profiles-s-z/snap-failure    | 2 +-
 apparmor.d/profiles-s-z/snap-seccomp    | 2 +-
 apparmor.d/profiles-s-z/snap-update-ns  | 2 +-
 apparmor.d/profiles-s-z/snapd           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apparmor.d/profiles-s-z/snap b/apparmor.d/profiles-s-z/snap
index 456c899e7..a882e5475 100644
--- a/apparmor.d/profiles-s-z/snap
+++ b/apparmor.d/profiles-s-z/snap
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = /{snap/snapd/@{int}/,}{usr/,}bin/snap
+@{exec_path} = @{bin}/snap /snap/snapd/@{int}@{bin}/snap
 profile snap @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
diff --git a/apparmor.d/profiles-s-z/snap-discard-ns b/apparmor.d/profiles-s-z/snap-discard-ns
index 278faabf0..c22141a7e 100644
--- a/apparmor.d/profiles-s-z/snap-discard-ns
+++ b/apparmor.d/profiles-s-z/snap-discard-ns
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = /{snap/snapd/@{int}/,}{usr/,}lib/snapd/snap-discard-ns
+@{exec_path} = @{lib}/snapd/snap-discard-ns /snap/snapd/@{int}@{lib}/snapd/snap-discard-ns
 profile snap-discard-ns @{exec_path} {
   include <abstractions/base>
 
diff --git a/apparmor.d/profiles-s-z/snap-failure b/apparmor.d/profiles-s-z/snap-failure
index 3ce23d709..511dc8c2b 100644
--- a/apparmor.d/profiles-s-z/snap-failure
+++ b/apparmor.d/profiles-s-z/snap-failure
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = /{snap/snapd/@{int}/,}{usr/,}lib/snapd/snap-failure
+@{exec_path} = @{lib}/snapd/snap-failure /snap/snapd/@{int}@{lib}/snapd/snap-failure
 profile snap-failure @{exec_path} {
   include <abstractions/base>
 
diff --git a/apparmor.d/profiles-s-z/snap-seccomp b/apparmor.d/profiles-s-z/snap-seccomp
index a1e69f44d..1be17540d 100644
--- a/apparmor.d/profiles-s-z/snap-seccomp
+++ b/apparmor.d/profiles-s-z/snap-seccomp
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = /{snap/snapd/@{int}/,}{usr/,}lib/snapd/snap-seccomp
+@{exec_path} = @{lib}/snapd/snap-seccomp /snap/snapd/@{int}@{lib}/snapd/snap-seccomp
 profile snap-seccomp @{exec_path} {
   include <abstractions/base>
   include <abstractions/consoles>
diff --git a/apparmor.d/profiles-s-z/snap-update-ns b/apparmor.d/profiles-s-z/snap-update-ns
index 61f3b815a..eba22e2c4 100644
--- a/apparmor.d/profiles-s-z/snap-update-ns
+++ b/apparmor.d/profiles-s-z/snap-update-ns
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = /{snap/snapd/@{int}/,}{usr/,}lib/snapd/snap-update-ns
+@{exec_path} = @{lib}/snapd/snap-update-ns /snap/snapd/@{int}@{lib}/snapd/snap-update-ns
 profile snap-update-ns @{exec_path} {
   include <abstractions/base>
 
diff --git a/apparmor.d/profiles-s-z/snapd b/apparmor.d/profiles-s-z/snapd
index 46813dacc..97299bc3d 100644
--- a/apparmor.d/profiles-s-z/snapd
+++ b/apparmor.d/profiles-s-z/snapd
@@ -6,7 +6,7 @@ abi <abi/3.0>,
 
 include <tunables/global>
 
-@{exec_path} = @{lib}/snapd/snapd /snap/snapd@{lib}/snapd/snapd
+@{exec_path} = @{lib}/snapd/snapd /snap/snapd/@{int}@{lib}/snapd/snapd
 profile snapd @{exec_path} {
   include <abstractions/base>
   include <abstractions/authentication>