Add @{MOUNTS} for all common mountpoints.

apparmor.d/groups/gvfs/gvfs-udisks2-volume-monitor

@@ -35,8 +35,8 @@ profile gvfs-udisks2-volume-monitor @{exec_path} {
   /etc/fstab r,
 
   # Mount points
-  /media/*/ r,
-  /media/*/*/ r,
+  @{MOUNTS}/*/ r,
+  @{MOUNTS}/*/*/ r,
   @{HOME}/*/*/ r,
   @{HOME}/*/*/**/ r,
   @{HOME}/bluetooth/ r,

apparmor.d/groups/gvfs/gvfsd-archive

@@ -16,14 +16,12 @@ profile gvfsd-archive @{exec_path} {
   @{exec_path} mr,
 
   owner @{HOME}/**.{tar,tar.gz,zip} r,
-  owner /media/**.{TAR,TAR.GZ,ZIP} r,
+  owner @{MOUNTS}/**.{TAR,TAR.GZ,ZIP} r,
   owner @{HOME}/**.{tar,tar.gz,zip} r,
-  owner /mnt/**.{TAR,TAR.GZ,ZIP} r,
 
   owner @{HOME}/**.{iso,img,bin,mdf,nrg} r,
-  owner /media/*/**.{iso,img,bin,mdf,nrg} r,
+  owner @{MOUNTS}/*/**.{iso,img,bin,mdf,nrg} r,
   owner @{HOME}/**.{ISO,IMG,BIN,MDF,NRG} r,
-  owner /mnt/*/**.{ISO,IMG,BIN,MDF,NRG} r,
 
   include if exists <local/gvfsd-archive>
 }

apparmor.d/groups/gvfs/gvfsd-recent

@@ -19,8 +19,7 @@ profile gvfsd-recent @{exec_path} {
 
   # Full access to user's data
   owner @{HOME}/{,**} rw,
-  owner /media/*/{,**} rw,
-  owner /mnt/*/{,**} rw,
+  owner @{MOUNTS}/*/{,**} rw,
 
   owner @{HOME}/.zshenv r,
   owner @{user_config_dirs}/user-dirs.dirs r,

apparmor.d/groups/gvfs/gvfsd-trash

@@ -31,8 +31,7 @@ profile gvfsd-trash @{exec_path} {
 
   # Can restore all user files
   owner @{HOME}/{,**} rw,
-  owner /media/*/{,**} rw,
-  owner /mnt/*/{,**} rw,
+  owner @{MOUNTS}/*/{,**} rw,
 
   include if exists <local/gvfsd-trash>
 }