picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pid1: restore console color support for containers (#3595)

Browse source 
Commit 3a18b60489 introduced a regression that
disabled the color mode for container.

This patch fixes this.
This commit is contained in:
Franck Bui 2016-06-24 16:08:43 +02:00 committed by Lennart Poettering
parent 3efb871a3c
commit 6edefe0b06
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/main.c
View file

@ -1507,13 +1507,14 @@ int main(int argc, char *argv[]) {
(void) write_string_file("/proc/sys/kernel/core_pattern", "|/bin/false", 0);
}
/* We expect the environment to be set correctly if run inside a
* container. */
if (arg_system && detect_container() <= 0) {
if (fixup_environment() < 0) {
error_message = "Failed to fix up PID1 environment";
goto finish;
}
if (arg_system) {
/* We expect the environment to be set correctly
* if run inside a container. */
if (detect_container() <= 0)
if (fixup_environment() < 0) {
error_message = "Failed to fix up PID1 environment";
goto finish;
}
/* Try to figure out if we can use colors with the console. No
* need to do that for user instances since they never log