diff options
author | Lennart Poettering <lennart@poettering.net> | 2019-04-24 18:43:56 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-05-08 06:36:20 -0400 |
commit | e82e549fb2cd97966bd3a5d38dfab15e3d9cd7b6 (patch) | |
tree | 88197e8586bedd3d4f69eef35f3a9eaf555c141d /src | |
parent | 22e596d6d5fa80fb33ab84451db8962e2facb17a (diff) | |
download | systemd-e82e549fb2cd97966bd3a5d38dfab15e3d9cd7b6.tar.gz |
tree-wide: make use of the new WRITE_STRING_FILE_MKDIR_0755 flag
Diffstat (limited to 'src')
-rw-r--r-- | src/firstboot/firstboot.c | 6 | ||||
-rw-r--r-- | src/gpt-auto-generator/gpt-auto-generator.c | 3 | ||||
-rw-r--r-- | src/nspawn/nspawn-cgroup.c | 3 | ||||
-rw-r--r-- | src/rfkill/rfkill.c | 8 |
4 files changed, 6 insertions, 14 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index d8d17cb5bd..ae2b1fd7fc 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -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"); diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 0f1e184eea..6c70054d93 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -521,13 +521,12 @@ static int add_root_rw(DissectedPartition *p) { (void) generator_enable_remount_fs_service(arg_dest); path = strjoina(arg_dest, "/systemd-remount-fs.service.d/50-remount-rw.conf"); - (void) mkdir_parents(path, 0755); r = write_string_file(path, "# Automatically generated by systemd-gpt-generator\n\n" "[Service]\n" "Environment=SYSTEMD_REMOUNT_ROOT_RW=1\n", - WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_NOFOLLOW); + WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_NOFOLLOW|WRITE_STRING_FILE_MKDIR_0755); if (r < 0) return log_error_errno(r, "Failed to write drop-in file %s: %m", path); diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c index ec62b64b00..f84bb39796 100644 --- a/src/nspawn/nspawn-cgroup.c +++ b/src/nspawn/nspawn-cgroup.c @@ -121,10 +121,9 @@ int sync_cgroup(pid_t pid, CGroupUnified unified_requested, uid_t uid_shift) { (void) rm_rf(fn, REMOVE_ROOT|REMOVE_ONLY_DIRECTORIES); fn = strjoina(tree, cgroup, "/cgroup.procs"); - (void) mkdir_parents(fn, 0755); sprintf(pid_string, PID_FMT, pid); - r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER); + r = write_string_file(fn, pid_string, WRITE_STRING_FILE_DISABLE_BUFFER|WRITE_STRING_FILE_MKDIR_0755); if (r < 0) { log_error_errno(r, "Failed to move process: %m"); goto finish; diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index 16610cd476..fe26566fa3 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -154,7 +154,7 @@ static int load_state(Context *c, const struct rfkill_event *event) { if (IN_SET(r, -ENOENT, 0)) { /* No state file or it's truncated? Then save the current state */ - r = write_string_file(state_file, one_zero(event->soft), WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC); + r = write_string_file(state_file, one_zero(event->soft), WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_MKDIR_0755); if (r < 0) return log_error_errno(r, "Failed to write state file %s: %m", state_file); @@ -246,7 +246,7 @@ static int save_state_cancel(Context *c, const struct rfkill_event *event) { static int save_state_write_one(struct write_queue_item *item) { int r; - r = write_string_file(item->file, one_zero(item->state), WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC); + r = write_string_file(item->file, one_zero(item->state), WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_MKDIR_0755); if (r < 0) return log_error_errno(r, "Failed to write state file %s: %m", item->file); @@ -280,10 +280,6 @@ static int run(int argc, char *argv[]) { umask(0022); - r = mkdir_p("/var/lib/systemd/rfkill", 0755); - if (r < 0) - return log_error_errno(r, "Failed to create rfkill directory: %m"); - n = sd_listen_fds(false); if (n < 0) return log_error_errno(n, "Failed to determine whether we got any file descriptors passed: %m"); |