aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2017-05-19 09:25:46 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2017-05-19 09:25:46 -0400
commit94134d89dbdd2feef5dc953d643271e44ad22a9e (patch)
tree10c047b2624b54b3c15c5069dba834e3d5c21d6a /src
parentsupport /dev/video* in private-dev, bringing back private-dev in firefox profile (diff)
downloadfirejail-94134d89dbdd2feef5dc953d643271e44ad22a9e.tar.gz
firejail-94134d89dbdd2feef5dc953d643271e44ad22a9e.tar.zst
firejail-94134d89dbdd2feef5dc953d643271e44ad22a9e.zip
bringing back firecfg --fix
Diffstat (limited to 'src')
-rw-r--r--src/firecfg/main.c14
-rw-r--r--src/man/firecfg.txt7
2 files changed, 21 insertions, 0 deletions
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index af5ebef98..4f957b4ae 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -47,6 +47,7 @@ static void usage(void) {
47 printf("Usage: firecfg [OPTIONS]\n\n"); 47 printf("Usage: firecfg [OPTIONS]\n\n");
48 printf(" --clean - remove all firejail symbolic links.\n\n"); 48 printf(" --clean - remove all firejail symbolic links.\n\n");
49 printf(" --debug - print debug messages.\n\n"); 49 printf(" --debug - print debug messages.\n\n");
50 printf(" --fix - fix .desktop files.\n\n");
50 printf(" --fix-sound - create ~/.config/pulse/client.conf file.\n\n"); 51 printf(" --fix-sound - create ~/.config/pulse/client.conf file.\n\n");
51 printf(" --help, -? - this help screen.\n\n"); 52 printf(" --help, -? - this help screen.\n\n");
52 printf(" --list - list all firejail symbolic links.\n\n"); 53 printf(" --list - list all firejail symbolic links.\n\n");
@@ -544,6 +545,19 @@ int main(int argc, char **argv) {
544 clear(); 545 clear();
545 return 0; 546 return 0;
546 } 547 }
548 else if (strcmp(argv[i], "--fix") == 0) {
549 // find home directory
550 struct passwd *pw = getpwuid(getuid());
551 if (!pw) {
552 goto errexit;
553 }
554 char *home = pw->pw_dir;
555 if (!home) {
556 goto errexit;
557 }
558 fix_desktop_files(home);
559 return 0;
560 }
547 else if (strcmp(argv[i], "--list") == 0) { 561 else if (strcmp(argv[i], "--list") == 0) {
548 list(); 562 list();
549 return 0; 563 return 0;
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt
index 55b60dcac..8cb9bcb3e 100644
--- a/src/man/firecfg.txt
+++ b/src/man/firecfg.txt
@@ -35,6 +35,13 @@ For user-driven manual integration, see \fBDESKTOP INTEGRATION\fR section in \fB
35.TP 35.TP
36\fB\-\-clean 36\fB\-\-clean
37Remove all firejail symbolic links. 37Remove all firejail symbolic links.
38
39.TP
40\fB\-\-fix
41Fix .desktop files. Some .desktop files use full path to executable. Firecfg will check .desktop files in
42/usr/share/applications/, replace full path by name if it is in PATH, and write result to $HOME/.local/share/applications/.
43This action is done by default when running "sudo firecfg". We have it as a separate option for regular users.
44
38.TP 45.TP
39\fB\-\-fix-sound 46\fB\-\-fix-sound
40Create a proper ~/.config/pulse/client.conf file without shm support. On some PulseAudio versions, 47Create a proper ~/.config/pulse/client.conf file without shm support. On some PulseAudio versions,