diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-12-12 13:57:24 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2023-01-12 15:13:34 +0000 |
| commit | bfafbc1f920b7d757cf9d67991ece567f1023c22 (patch) | |
| tree | 26addbeb7e24f4cc021d8088ad1f48483734bc9c /common | |
| parent | 523cedc27509779e7e815806e53361d5fe7e0bd4 (diff) | |
| download | flatpak-bfafbc1f920b7d757cf9d67991ece567f1023c22.tar.gz | |
exports, context: List unexported paths one per line in sorted order
This will reduce conflicts when new entries are added.
Helps: https://github.com/flatpak/flatpak/issues/5205
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/flatpak-context.c | 22 | ||||
| -rw-r--r-- | common/flatpak-exports.c | 7 |
2 files changed, 26 insertions, 3 deletions
diff --git a/common/flatpak-context.c b/common/flatpak-context.c index 9e028fb5..ca4e73d5 100644 --- a/common/flatpak-context.c +++ b/common/flatpak-context.c @@ -2435,8 +2435,26 @@ flatpak_context_make_sandboxed (FlatpakContext *context) } const char *dont_mount_in_root[] = { - ".", "..", "lib", "lib32", "lib64", "bin", "sbin", "usr", "boot", "efi", - "root", "tmp", "etc", "app", "run", "proc", "sys", "dev", "var", NULL + ".", + "..", + "app", + "bin", + "boot", + "dev", + "efi", + "etc", + "lib", + "lib32", + "lib64", + "proc", + "root", + "run", + "sbin", + "sys", + "tmp", + "usr", + "var", + NULL }; static void diff --git a/common/flatpak-exports.c b/common/flatpak-exports.c index 15acc5b8..9a33cca9 100644 --- a/common/flatpak-exports.c +++ b/common/flatpak-exports.c @@ -52,7 +52,12 @@ flatpak_abs_usrmerged_dirs get the same treatment without having to be listed here. */ const char *dont_export_in[] = { - "/usr", "/etc", "/app", "/dev", "/proc", NULL + "/app", + "/dev", + "/etc", + "/proc", + "/usr", + NULL }; static char * |