From cbbe9ab40fd41e5319d30911c5738188527944d4 Mon Sep 17 00:00:00 2001 From: Hank Leininger Date: Fri, 5 Nov 2021 20:40:22 -0600 Subject: Relocate firecfg.config to /etc/firejail/ This should make it easier for users, and distributions, to customize which programs they want firejail to wrap. Also fixed some firecfg.cfg -> firecfg.config references. Signed-off-by: Hank Leininger Closes: https://github.com/netblue30/firejail/issues/408 Bug: https://github.com/netblue30/firejail/issues/2097 Bug: https://github.com/netblue30/firejail/issues/2829 Bug: https://github.com/netblue30/firejail/issues/3665 --- src/firecfg/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/firecfg/main.c') diff --git a/src/firecfg/main.c b/src/firecfg/main.c index 363000e15..fafa0e635 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c @@ -171,17 +171,17 @@ static void set_file(const char *name, const char *firejail_exec) { free(fname); } -// parse /usr/lib/firejail/firecfg.cfg file +// parse /etc/firejail/firecfg.config file static void set_links_firecfg(void) { char *cfgfile; - if (asprintf(&cfgfile, "%s/firejail/firecfg.config", LIBDIR) == -1) + if (asprintf(&cfgfile, "%s/firecfg.config", SYSCONFDIR) == -1) errExit("asprintf"); char *firejail_exec; if (asprintf(&firejail_exec, "%s/bin/firejail", PREFIX) == -1) errExit("asprintf"); - // parse /usr/lib/firejail/firecfg.cfg file + // parse /etc/firejail/firecfg.config file FILE *fp = fopen(cfgfile, "r"); if (!fp) { perror("fopen"); @@ -440,7 +440,7 @@ int main(int argc, char **argv) { // clear all symlinks clean(); - // set new symlinks based on /usr/lib/firejail/firecfg.cfg + // set new symlinks based on /etc/firejail/firecfg.config set_links_firecfg(); if (getuid() == 0) { -- cgit v1.2.3-54-g00ecf