ladishd: the reset of the previous commit
This commit is contained in:
parent
d027731b18
commit
c7d0a6a479
|
@ -306,13 +306,16 @@ loader_exec_program(
|
||||||
argv[i++] = "-e";
|
argv[i++] = "-e";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
|
if (!run_in_terminal || strchr(commandline, '$') != NULL)
|
||||||
{
|
{
|
||||||
argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
|
if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
|
||||||
}
|
{
|
||||||
i++;
|
argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
|
||||||
|
}
|
||||||
|
i++;
|
||||||
|
|
||||||
argv[i++] = "-c";
|
argv[i++] = "-c";
|
||||||
|
}
|
||||||
|
|
||||||
argv[i++] = commandline;
|
argv[i++] = commandline;
|
||||||
argv[i++] = NULL;
|
argv[i++] = NULL;
|
||||||
|
|
Loading…
Reference in New Issue