diff options
| author | Lennart Poettering <lennart@poettering.net> | 2024-10-22 10:09:20 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2024-10-22 17:51:26 +0200 |
| commit | 8eeb870971b86f1d7f39b3cb4cc18c8bf594320f (patch) | |
| tree | eabaa25814121d1992ae598e040a535b8716eb8f /src/hostname | |
| parent | fs-util: tweak how openat_report_new() operates when O_CREAT is used on a dan... (diff) | |
| download | systemd-8eeb870971b86f1d7f39b3cb4cc18c8bf594320f.tar.xz systemd-8eeb870971b86f1d7f39b3cb4cc18c8bf594320f.zip | |
fileio: port write_string_file() to LabelOps, and thus add WRITE_STRING_FILE_LABEL flag
Given that we have the LabelOps abstraction these days, we can teach
write_string_file() to use it, which means we can get rid of
fileio-label.[ch] as a separate concept.
(The only reason that fileio-label.[ch] exists independently of
fileio.[ch] was that the former linekd to libselinux potentially, and
thus had to be in src/shared/ while the other always was in src/basic/.
But the LabelOps vtable provides us with a nice work-around)
Diffstat (limited to 'src/hostname')
| -rw-r--r-- | src/hostname/hostnamed.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index df0ebe8daa..d2444dbf2d 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -19,7 +19,6 @@ #include "env-file-label.h" #include "env-file.h" #include "env-util.h" -#include "fileio-label.h" #include "fileio.h" #include "hostname-setup.h" #include "hostname-util.h" @@ -619,7 +618,7 @@ static int context_write_data_static_hostname(Context *c) { return 0; } - r = write_string_file_atomic_label("/etc/hostname", c->data[PROP_STATIC_HOSTNAME]); + r = write_string_file("/etc/hostname", c->data[PROP_STATIC_HOSTNAME], WRITE_STRING_FILE_CREATE|WRITE_STRING_FILE_ATOMIC|WRITE_STRING_FILE_LABEL); if (r < 0) return r; |