diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-05 00:47:56 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-06-05 00:47:56 +0200 |
commit | 20f8477be541f2486737f1be32bdb0bd0d6372fd (patch) | |
tree | b99412abf9bf45fddc04ef330f5546059d3a444d /src/systemctl | |
parent | networkd-link: fix handler typo for route_remove() (#3433) (diff) | |
parent | update TODO (diff) | |
download | systemd-20f8477be541f2486737f1be32bdb0bd0d6372fd.tar.xz systemd-20f8477be541f2486737f1be32bdb0bd0d6372fd.zip |
Merge pull request #3392 from poettering/assorted-stuff
Assorted stuff
Diffstat (limited to 'src/systemctl')
-rw-r--r-- | src/systemctl/systemctl.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index e8f487e9f4..e6ff299dd4 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -5218,9 +5218,7 @@ static int switch_root(int argc, char *argv[], void *userdata) { init = cmdline_init; } - if (isempty(init)) - init = NULL; - + init = empty_to_null(init); if (init) { const char *root_systemd_path = NULL, *root_init_path = NULL; |