Merge pull request #3392 from poettering/assorted-stuff

Assorted stuff
2016-06-04 18:47:56 -04:00
parent 3fb1ac5d57 ac83514cbf
commit 20f8477be5
19 changed files with 91 additions and 152 deletions
@@ -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;