aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-03-13 09:11:45 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-03-13 09:11:45 -0400
commiteee1d3c55bef5679f83bb9008a2c11697c9817e0 (patch)
tree2a1f74a956721feba024af44e0786bb54d661369
parent(Temporarily?) fix private-lib for evince. See #1711"e (diff)
downloadfirejail-eee1d3c55bef5679f83bb9008a2c11697c9817e0.tar.gz
firejail-eee1d3c55bef5679f83bb9008a2c11697c9817e0.tar.zst
firejail-eee1d3c55bef5679f83bb9008a2c11697c9817e0.zip
fix PROMPT_COMMAND for bash - this was the problem on CentOS that we needed to unblacklist /etc/profile.d; I'll do some cleanup in the next commit
-rw-r--r--etc/default.profile3
-rw-r--r--src/firejail/env.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/default.profile b/etc/default.profile
index 226e808ed..82eded802 100644
--- a/etc/default.profile
+++ b/etc/default.profile
@@ -8,9 +8,6 @@ include /etc/firejail/globals.local
8# generic gui profile 8# generic gui profile
9# depending on your usage, you can enable some of the commands below: 9# depending on your usage, you can enable some of the commands below:
10 10
11# required under CentOS 7
12noblacklist /etc/profile.d
13
14include /etc/firejail/disable-common.inc 11include /etc/firejail/disable-common.inc
15# include /etc/firejail/disable-devel.inc 12# include /etc/firejail/disable-devel.inc
16include /etc/firejail/disable-passwdmgr.inc 13include /etc/firejail/disable-passwdmgr.inc
diff --git a/src/firejail/env.c b/src/firejail/env.c
index ad9f736b0..3f39b7cca 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -147,6 +147,11 @@ void env_defaults(void) {
147 if (setenv("PROMPT_COMMAND", "export PS1=\"\\[\\e[1;32m\\][\\u@\\h \\W]\\$\\[\\e[0m\\] \"", 1) < 0) 147 if (setenv("PROMPT_COMMAND", "export PS1=\"\\[\\e[1;32m\\][\\u@\\h \\W]\\$\\[\\e[0m\\] \"", 1) < 0)
148 errExit("setenv"); 148 errExit("setenv");
149 } 149 }
150 else {
151 // remove PROMPT_COMMAND
152 if (setenv("PROMPT_COMMAND", " ", 1) < 0)
153 errExit("setenv");
154 }
150 155
151 // set the window title 156 // set the window title
152 if (!arg_quiet) 157 if (!arg_quiet)