diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-28 14:42:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 14:42:55 +0200 |
| commit | 127c167cdbbce1c3d730cd53fd79ef5a0603ab7d (patch) | |
| tree | 8390fee7c2b1fb72ce34a7f819483be6f5104bb9 /src/firstboot | |
| parent | 365939fc9f52686359d56f324939498e830932ce (diff) | |
| parent | e82e549fb2cd97966bd3a5d38dfab15e3d9cd7b6 (diff) | |
| download | systemd-127c167cdbbce1c3d730cd53fd79ef5a0603ab7d.tar.gz | |
Merge pull request #12390 from poettering/string-file-mkdir
fileio: add a WRITE_STRING_FILE_MKDIR_0755 flag to write_string_file() that creates parent directories if needed
Diffstat (limited to 'src/firstboot')
| -rw-r--r-- | src/firstboot/firstboot.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 7d97777b0d..e6b40294bf 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -253,7 +253,7 @@ static int process_locale(void) { if (arg_copy_locale && arg_root) { - mkdir_parents(etc_localeconf, 0755); + (void) mkdir_parents(etc_localeconf, 0755); r = copy_file("/etc/locale.conf", etc_localeconf, 0, 0644, 0, 0, COPY_REFLINK); if (r != -ENOENT) { if (r < 0) @@ -278,7 +278,7 @@ static int process_locale(void) { locales[i] = NULL; - mkdir_parents(etc_localeconf, 0755); + (void) mkdir_parents(etc_localeconf, 0755); r = write_env_file(etc_localeconf, locales); if (r < 0) return log_error_errno(r, "Failed to write %s: %m", etc_localeconf); @@ -327,7 +327,7 @@ static int process_keymap(void) { if (arg_copy_keymap && arg_root) { - mkdir_parents(etc_vconsoleconf, 0755); + (void) mkdir_parents(etc_vconsoleconf, 0755); r = copy_file("/etc/vconsole.conf", etc_vconsoleconf, 0, 0644, 0, 0, COPY_REFLINK); if (r != -ENOENT) { if (r < 0) @@ -411,7 +411,7 @@ static int process_timezone(void) { if (r < 0) return log_error_errno(r, "Failed to read host timezone: %m"); - mkdir_parents(etc_localtime, 0755); + (void) mkdir_parents(etc_localtime, 0755); if (symlink(p, etc_localtime) < 0) return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); @@ -429,7 +429,7 @@ static int process_timezone(void) { e = strjoina("../usr/share/zoneinfo/", arg_timezone); - mkdir_parents(etc_localtime, 0755); + (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) return log_error_errno(errno, "Failed to create %s symlink: %m", etc_localtime); @@ -490,9 +490,8 @@ static int process_hostname(void) { if (isempty(arg_hostname)) return 0; - mkdir_parents(etc_hostname, 0755); r = write_string_file(etc_hostname, arg_hostname, - WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC); + WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC | WRITE_STRING_FILE_MKDIR_0755); if (r < 0) return log_error_errno(r, "Failed to write %s: %m", etc_hostname); @@ -512,9 +511,8 @@ static int process_machine_id(void) { if (sd_id128_is_null(arg_machine_id)) return 0; - mkdir_parents(etc_machine_id, 0755); r = write_string_file(etc_machine_id, sd_id128_to_string(arg_machine_id, id), - WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC); + WRITE_STRING_FILE_CREATE | WRITE_STRING_FILE_SYNC | WRITE_STRING_FILE_MKDIR_0755); if (r < 0) return log_error_errno(r, "Failed to write machine id: %m"); @@ -615,7 +613,7 @@ static int process_root_password(void) { if (laccess(etc_shadow, F_OK) >= 0) return 0; - mkdir_parents(etc_shadow, 0755); + (void) mkdir_parents(etc_shadow, 0755); lock = take_etc_passwd_lock(arg_root); if (lock < 0) |