diff options
| author | Daniel Mack <github@zonque.org> | 2015-11-02 10:10:44 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-11-02 10:10:44 +0100 |
| commit | d0744e54eb83a9f4e4f54a59de3905699a667be0 (patch) | |
| tree | 67deec65f866186503d4a45c1197121625b159cb /src/systemctl/systemctl.c | |
| parent | 534e8f89d6367cd0e9e17fff67880fb430071d01 (diff) | |
| parent | 3958325852869a5e490b5741016c93b8b9a80e11 (diff) | |
Merge pull request #1745 from poettering/journal-deadlock
Make sure journald never blocks on sd_notify() to PID 1
Diffstat (limited to 'src/systemctl/systemctl.c')
| -rw-r--r-- | src/systemctl/systemctl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index f5efa1a064..da816e6d0e 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -296,6 +296,10 @@ static bool install_client_side(void) { if (arg_scope == UNIT_FILE_GLOBAL) return true; + /* Unsupported environment variable, mostly for debugging purposes */ + if (getenv_bool("SYSTEMCTL_INSTALL_CLIENT_SIDE") > 0) + return true; + return false; } @@ -5317,6 +5321,9 @@ static int enable_sysv_units(const char *verb, char **args) { if (arg_scope != UNIT_FILE_SYSTEM) return 0; + if (getenv_bool("SYSTEMCTL_SKIP_SYSV") > 0) + return 0; + if (!STR_IN_SET(verb, "enable", "disable", |