diff options
Diffstat (limited to 'src/firecfg')
-rwxr-xr-x | src/firecfg/firejail-welcome.sh | 11 | ||||
-rw-r--r-- | src/firecfg/main.c | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/firecfg/firejail-welcome.sh b/src/firecfg/firejail-welcome.sh index 7183b74e1..a7e74ebc3 100755 --- a/src/firecfg/firejail-welcome.sh +++ b/src/firecfg/firejail-welcome.sh | |||
@@ -36,12 +36,13 @@ enable_nonewprivs=false | |||
36 | read -r -d $'\0' MSG_INTRO <<EOM | 36 | read -r -d $'\0' MSG_INTRO <<EOM |
37 | <big><b>Welcome to Firejail!</b></big> | 37 | <big><b>Welcome to Firejail!</b></big> |
38 | 38 | ||
39 | This guide will walk you through some of the most common sandbox customizations. At the end of the | 39 | This guide will walk you through some of the most common sandbox customizations. |
40 | guide you'll have the option to save your changes in Firejail's global config file at | 40 | At the end of the guide you'll have the option to save your changes in Firejail's |
41 | <b>/etc/firejail/firejail.config</b>. A copy of the original file is stored as | 41 | global config file at <b>/etc/firejail/firejail.config</b>. A copy of the original file is saved |
42 | <b>/etc/firejal/firejail.config-</b>. | 42 | as <b>/etc/firejal/firejail.config-</b>. |
43 | 43 | ||
44 | Please note that running this script a second time can set new options, but does not clear options set in a previous run. | 44 | Please note that running this script a second time can set new options, but does |
45 | not clear options set in a previous run. | ||
45 | 46 | ||
46 | Press OK to continue, or close this window to stop the program. | 47 | Press OK to continue, or close this window to stop the program. |
47 | 48 | ||
diff --git a/src/firecfg/main.c b/src/firecfg/main.c index 0c81f69bd..07e30415b 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c | |||
@@ -444,8 +444,14 @@ int main(int argc, char **argv) { | |||
444 | 444 | ||
445 | if (arg_guide) { | 445 | if (arg_guide) { |
446 | char *cmd; | 446 | char *cmd; |
447 | if (arg_debug) { | ||
448 | if (asprintf(&cmd, "sudo %s/firejail/firejail-welcome.sh /usr/lib/firejail/fzenity %s %s", LIBDIR, SYSCONFDIR, user) == -1) | ||
449 | errExit("asprintf"); | ||
450 | } | ||
451 | else { | ||
447 | if (asprintf(&cmd, "sudo %s/firejail/firejail-welcome.sh /usr/bin/zenity %s %s", LIBDIR, SYSCONFDIR, user) == -1) | 452 | if (asprintf(&cmd, "sudo %s/firejail/firejail-welcome.sh /usr/bin/zenity %s %s", LIBDIR, SYSCONFDIR, user) == -1) |
448 | errExit("asprintf"); | 453 | errExit("asprintf"); |
454 | } | ||
449 | int status = system(cmd); | 455 | int status = system(cmd); |
450 | if (status == -1) { | 456 | if (status == -1) { |
451 | fprintf(stderr, "Error: cannot run firejail-welcome.sh\n"); | 457 | fprintf(stderr, "Error: cannot run firejail-welcome.sh\n"); |