mirror of
https://github.com/roddhjav/apparmor.d.git
synced 2025-01-29 22:35:15 +01:00
Resolve merge conflicts
Signed-off-by: Jeroen Rijken <jeroen.rijken@xs4all.nl>
This commit is contained in:
parent
6911ca7c13
commit
dfadf0aef0
2 changed files with 3 additions and 13 deletions
|
@ -69,11 +69,11 @@ profile apt-methods-gpgv @{exec_path} {
|
|||
/etc/ r,
|
||||
/root/ r,
|
||||
|
||||
/var/lib/apt/lists/{,**} r,
|
||||
{/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/{,**} r,
|
||||
/var/lib/dpkg/arch r,
|
||||
/var/lib/extrepo/keys/*.{gpg,asc} r,
|
||||
/var/lib/ubuntu-advantage/apt-esm/{,**} r,
|
||||
owner /var/lib/apt/lists/* rw,
|
||||
owner {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/* rw,
|
||||
owner /var/lib/apt/lists/partial/* rw,
|
||||
|
||||
# For package building
|
||||
|
@ -84,15 +84,6 @@ profile apt-methods-gpgv @{exec_path} {
|
|||
owner /tmp/apt-key-gpghome.*/** rwkl -> /tmp/apt-key-gpghome.*/**,
|
||||
owner /tmp/apt.{conf,sig,data}.* rw,
|
||||
|
||||
/var/lib/apt/lists/{,**} r,
|
||||
owner {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/* rw,
|
||||
owner /var/lib/apt/lists/partial/* rw,
|
||||
|
||||
/usr/share/dpkg/cputable r,
|
||||
/usr/share/dpkg/tupletable r,
|
||||
|
||||
/var/lib/dpkg/arch r,
|
||||
|
||||
@{PROC}/@{pid}/fd/ r,
|
||||
|
||||
# file_inherit
|
||||
|
|
|
@ -53,10 +53,9 @@ profile apt-methods-http @{exec_path} {
|
|||
|
||||
/var/log/cron-apt/temp w,
|
||||
|
||||
/var/lib/apt/lists/{,**} r,
|
||||
{/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/{,**} r,
|
||||
owner {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/* rw,
|
||||
owner /var/lib/apt/lists/partial/* rw,
|
||||
owner /var/lib/apt/lists/{,**} rw,
|
||||
|
||||
# For package building
|
||||
@{user_build_dirs}/** rwkl -> @{user_build_dirs}/**,
|
||||
|
|
Loading…
Reference in a new issue