[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/13] qemu-bridge-helper: relocate path to default ACL
From: |
Paolo Bonzini |
Subject: |
[PATCH 10/13] qemu-bridge-helper: relocate path to default ACL |
Date: |
Tue, 1 Sep 2020 02:20:17 -0400 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qemu-bridge-helper.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c
index 88b26747fc..a26e1663f0 100644
--- a/qemu-bridge-helper.c
+++ b/qemu-bridge-helper.c
@@ -40,6 +40,7 @@
#endif
#include "qemu/queue.h"
+#include "qemu/cutils.h"
#include "net/tap-linux.h"
@@ -245,6 +246,7 @@ int main(int argc, char **argv)
ACLList acl_list;
int access_allowed, access_denied;
int ret = EXIT_SUCCESS;
+ g_autofree char *acl_file = NULL;
#ifdef CONFIG_LIBCAP_NG
/* if we're run from an suid binary, immediately drop privileges preserving
@@ -257,6 +259,8 @@ int main(int argc, char **argv)
}
#endif
+ qemu_init_exec_dir(argv[0]);
+
/* parse arguments */
for (index = 1; index < argc; index++) {
if (strcmp(argv[index], "--use-vnet") == 0) {
@@ -282,9 +286,10 @@ int main(int argc, char **argv)
/* parse default acl file */
QSIMPLEQ_INIT(&acl_list);
- if (parse_acl_file(DEFAULT_ACL_FILE, &acl_list) == -1) {
+ acl_file = get_relocated_path(DEFAULT_ACL_FILE);
+ if (parse_acl_file(acl_file, &acl_list) == -1) {
fprintf(stderr, "failed to parse default acl file `%s'\n",
- DEFAULT_ACL_FILE);
+ acl_file);
ret = EXIT_FAILURE;
goto cleanup;
}
--
2.26.2
- [PATCH 06/13] module: relocate path to modules, (continued)
- [PATCH 12/13] ui: relocate paths to icons and translations, Paolo Bonzini, 2020/09/01
- [PATCH 13/13] configure: use a platform-neutral prefix, Paolo Bonzini, 2020/09/01
- [PATCH 10/13] qemu-bridge-helper: relocate path to default ACL,
Paolo Bonzini <=
- [PATCH 04/13] cutils: introduce get_relocated_path, Paolo Bonzini, 2020/09/01
- [PATCH 11/13] qga: relocate path to default configuration and hook, Paolo Bonzini, 2020/09/01
- Re: [PATCH 00/13] Make QEMU installation relocatable, Mark Cave-Ayland, 2020/09/01
- Re: [PATCH 00/13] Make QEMU installation relocatable, Paolo Bonzini, 2020/09/01
- Re: [PATCH 00/13] Make QEMU installation relocatable, Mark Cave-Ayland, 2020/09/02
- Re: [PATCH 00/13] Make QEMU installation relocatable, Paolo Bonzini, 2020/09/02
- Re: [PATCH 00/13] Make QEMU installation relocatable, Mark Cave-Ayland, 2020/09/02
- Re: [PATCH 00/13] Make QEMU installation relocatable, Mark Cave-Ayland, 2020/09/02
- Re: [PATCH 00/13] Make QEMU installation relocatable, Paolo Bonzini, 2020/09/02
- Re: [PATCH 00/13] Make QEMU installation relocatable, Mark Cave-Ayland, 2020/09/02