diff options
| author | Daniel Mack <daniel@zonque.org> | 2015-07-06 19:19:25 -0400 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2015-07-06 19:19:25 -0400 |
| commit | 4c1fc3e404d648c70bd2f50ac50aeac6ece8872e (patch) | |
| tree | 977a223a8f5aa7fc2a5861a8d557b879bfc98a9f /src/nspawn | |
| parent | 40beecdb6d1c73e5acb62ebac2ccbfd7891f2418 (diff) | |
fileio: consolidate write_string_file*()
Merge write_string_file(), write_string_file_no_create() and
write_string_file_atomic() into write_string_file() and provide a flags mask
that allows combinations of atomic writing, newline appending and automatic
file creation. Change all users accordingly.
Diffstat (limited to 'src/nspawn')
| -rw-r--r-- | src/nspawn/nspawn.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index ab9fbaf138..c7f4d02855 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1703,7 +1703,7 @@ static int setup_boot_id(const char *dest) { id128_format_as_uuid(rnd, as_uuid); - r = write_string_file(from, as_uuid); + r = write_string_file(from, as_uuid, WRITE_STRING_FILE_CREATE); if (r < 0) return log_error_errno(r, "Failed to write boot id: %m"); @@ -2508,7 +2508,7 @@ static int reset_audit_loginuid(void) { if (streq(p, "4294967295")) return 0; - r = write_string_file("/proc/self/loginuid", "4294967295"); + r = write_string_file("/proc/self/loginuid", "4294967295", WRITE_STRING_FILE_CREATE); if (r < 0) { log_error_errno(r, "Failed to reset audit login UID. This probably means that your kernel is too\n" @@ -4448,13 +4448,13 @@ static int setup_uid_map(pid_t pid) { xsprintf(uid_map, "/proc/" PID_FMT "/uid_map", pid); xsprintf(line, UID_FMT " " UID_FMT " " UID_FMT "\n", 0, arg_uid_shift, arg_uid_range); - r = write_string_file(uid_map, line); + r = write_string_file(uid_map, line, WRITE_STRING_FILE_CREATE); if (r < 0) return log_error_errno(r, "Failed to write UID map: %m"); /* We always assign the same UID and GID ranges */ xsprintf(uid_map, "/proc/" PID_FMT "/gid_map", pid); - r = write_string_file(uid_map, line); + r = write_string_file(uid_map, line, WRITE_STRING_FILE_CREATE); if (r < 0) return log_error_errno(r, "Failed to write GID map: %m"); |