picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bootctl: use path_join() to join paths

Browse source 
We would say "/boot/efi//loader/entries"...
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-03-12 09:30:45 +01:00
parent 694fe6daf5
commit e2600fd582
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/boot/bootctl.c
View file

@ -517,9 +517,9 @@ static int copy_file_with_version_check(const char *from, const char *to, bool f
}
static int mkdir_one(const char *prefix, const char *suffix) {
char *p;
_cleanup_free_ char *p = NULL;
p = strjoina(prefix, "/", suffix);
p = path_join(prefix, suffix);
if (mkdir(p, 0700) < 0) {
if (errno != EEXIST)
return log_error_errno(errno, "Failed to create \"%s\": %m", p);
@ -935,7 +935,7 @@ static int install_entries_directories(const char *dollar_boot_path, sd_id128_t
* partition. Also create the parent directory for entry directories, so that kernel-install
* knows where to put them. */
r = mkdir_one(dollar_boot_path, "/loader/entries");
r = mkdir_one(dollar_boot_path, "loader/entries");
if (r < 0)
return r;