diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-02-03 02:05:59 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-02-03 02:05:59 +0100 |
| commit | 63c372cb9df3bee01e3bf8cd7f96f336bddda846 (patch) | |
| tree | bf4d1b6e41f72927a2b58e7dd21daa0c496aaa96 /src/shared/switch-root.c | |
| parent | 44de0efc6e406515fc1cf8b95d9655d0d7f7ffff (diff) | |
util: rework strappenda(), and rename it strjoina()
After all it is now much more like strjoin() than strappend(). At the
same time, add support for NULL sentinels, even if they are normally not
necessary.
Diffstat (limited to 'src/shared/switch-root.c')
| -rw-r--r-- | src/shared/switch-root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/switch-root.c b/src/shared/switch-root.c index e8cedc69cc..813641ad44 100644 --- a/src/shared/switch-root.c +++ b/src/shared/switch-root.c @@ -51,7 +51,7 @@ int switch_root(const char *new_root, const char *oldroot, bool detach_oldroot, if (path_equal(new_root, "/")) return 0; - temporary_old_root = strappenda(new_root, oldroot); + temporary_old_root = strjoina(new_root, oldroot); mkdir_p_label(temporary_old_root, 0755); old_root_remove = in_initrd(); |