diff options
author | Tad <tad@spotco.us> | 2019-06-30 07:56:59 -0400 |
---|---|---|
committer | Tad <tad@spotco.us> | 2019-06-30 07:56:59 -0400 |
commit | 04e2ad8f8f49a21912e6a38a3399c6152de24377 (patch) | |
tree | a3cab5c8f3f30e4f173bc60cf255e3c012138c61 | |
parent | Update profile templates (diff) | |
download | firejail-04e2ad8f8f49a21912e6a38a3399c6152de24377.tar.gz firejail-04e2ad8f8f49a21912e6a38a3399c6152de24377.tar.zst firejail-04e2ad8f8f49a21912e6a38a3399c6152de24377.zip |
https://github.com/netblue30/firejail/commit/b1aff3395c77da467b7ba5e8fb8dabc33c37f8c6#commitcomment-34131283
-rw-r--r-- | src/firejail/x11.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/firejail/x11.c b/src/firejail/x11.c index 2a1a51a03..49ffc8723 100644 --- a/src/firejail/x11.c +++ b/src/firejail/x11.c | |||
@@ -222,7 +222,7 @@ void x11_start_xvfb(int argc, char **argv) { | |||
222 | fprintf(stderr, "\nError: Xvfb program was not found in /usr/bin directory, please install it:\n"); | 222 | fprintf(stderr, "\nError: Xvfb program was not found in /usr/bin directory, please install it:\n"); |
223 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xvfb\n"); | 223 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xvfb\n"); |
224 | fprintf(stderr, " Arch: sudo pacman -S xorg-server-xvfb\n"); | 224 | fprintf(stderr, " Arch: sudo pacman -S xorg-server-xvfb\n"); |
225 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-server-Xvfb\n"); | 225 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-server-Xvfb\n"); |
226 | exit(0); | 226 | exit(0); |
227 | } | 227 | } |
228 | 228 | ||
@@ -442,7 +442,7 @@ void x11_start_xephyr(int argc, char **argv) { | |||
442 | fprintf(stderr, "\nError: Xephyr program was not found in /usr/bin directory, please install it:\n"); | 442 | fprintf(stderr, "\nError: Xephyr program was not found in /usr/bin directory, please install it:\n"); |
443 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xserver-xephyr\n"); | 443 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xserver-xephyr\n"); |
444 | fprintf(stderr, " Arch: sudo pacman -S xorg-server-xephyr\n"); | 444 | fprintf(stderr, " Arch: sudo pacman -S xorg-server-xephyr\n"); |
445 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-server-Xephyr\n"); | 445 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-server-Xephyr\n"); |
446 | exit(0); | 446 | exit(0); |
447 | } | 447 | } |
448 | 448 | ||
@@ -1025,8 +1025,8 @@ void x11_start_xpra(int argc, char **argv) { | |||
1025 | if (!program_in_path("xpra")) { | 1025 | if (!program_in_path("xpra")) { |
1026 | fprintf(stderr, "\nError: Xpra program was not found in /usr/bin directory, please install it:\n"); | 1026 | fprintf(stderr, "\nError: Xpra program was not found in /usr/bin directory, please install it:\n"); |
1027 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xpra\n"); | 1027 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xpra\n"); |
1028 | fprintf(stderr, " Arch: sudo pacman -S xpra\n"); | 1028 | fprintf(stderr, " Arch: sudo pacman -S xpra\n"); |
1029 | fprintf(stderr, " Fedora: sudo dnf install xpra\n"); | 1029 | fprintf(stderr, " Fedora: sudo dnf install xpra\n"); |
1030 | exit(0); | 1030 | exit(0); |
1031 | } | 1031 | } |
1032 | 1032 | ||
@@ -1062,8 +1062,8 @@ void x11_start(int argc, char **argv) { | |||
1062 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xserver-xephyr\n"); | 1062 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xserver-xephyr\n"); |
1063 | fprintf(stderr, " Arch: sudo pacman -S xpra\n"); | 1063 | fprintf(stderr, " Arch: sudo pacman -S xpra\n"); |
1064 | fprintf(stderr, " Arch: sudo pacman -S xorg-server-xephyr\n"); | 1064 | fprintf(stderr, " Arch: sudo pacman -S xorg-server-xephyr\n"); |
1065 | fprintf(stderr, " Fedora: sudo dnf install xpra\n"); | 1065 | fprintf(stderr, " Fedora: sudo dnf install xpra\n"); |
1066 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-server-Xephyr\n"); | 1066 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-server-Xephyr\n"); |
1067 | exit(0); | 1067 | exit(0); |
1068 | } | 1068 | } |
1069 | } | 1069 | } |
@@ -1095,9 +1095,9 @@ void x11_xorg(void) { | |||
1095 | struct stat s; | 1095 | struct stat s; |
1096 | if (stat("/usr/bin/xauth", &s) == -1) { | 1096 | if (stat("/usr/bin/xauth", &s) == -1) { |
1097 | fprintf(stderr, "Error: xauth utility not found in /usr/bin. Please install it:\n"); | 1097 | fprintf(stderr, "Error: xauth utility not found in /usr/bin. Please install it:\n"); |
1098 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xauth\n"); | 1098 | fprintf(stderr, " Debian/Ubuntu/Mint: sudo apt-get install xauth\n"); |
1099 | fprintf(stderr, " Arch: sudo pacman -S xorg-xauth\n"); | 1099 | fprintf(stderr, " Arch: sudo pacman -S xorg-xauth\n"); |
1100 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-xauth\n"); | 1100 | fprintf(stderr, " Fedora: sudo dnf install xorg-x11-xauth\n"); |
1101 | exit(1); | 1101 | exit(1); |
1102 | } | 1102 | } |
1103 | if (s.st_uid != 0 && s.st_gid != 0) { | 1103 | if (s.st_uid != 0 && s.st_gid != 0) { |