SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12870 from yuwata/tree-wide-further-path-join-cleanups

Browse Source 
tree-wide: further path_join() and path_joina() cleanups
This commit is contained in:
Lennart Poettering
2019-06-25 09:27:01 +02:00
committed by GitHub
parent 01a619a6ac 270384b2d4
commit 05b2ace147
20 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+2 -2
View File
@@ -6287,8 +6287,8 @@ static int switch_root(int argc, char *argv[], void *userdata) {
if (init) {
const char *root_systemd_path = NULL, *root_init_path = NULL;
root_systemd_path = strjoina(root, "/" SYSTEMD_BINARY_PATH);
root_init_path = strjoina(root, "/", init);
root_systemd_path = prefix_roota(root, "/" SYSTEMD_BINARY_PATH);
root_init_path = prefix_roota(root, init);
/* If the passed init is actually the same as the
* systemd binary, then let's suppress it. */