From: dongshengyuan <545258830@qq.com> Date: Sun, 26 Jul 2026 06:46:45 +0000 (+0800) Subject: shared: drop stale env-file-label source X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8f0be5e34067bdaac19fec602537f52a7b9f6be;p=thirdparty%2Fsystemd.git shared: drop stale env-file-label source env-file-label.[ch] was removed by 3e5320e27d3e ("env-file: port write_env_file() to label_ops_pre()"), which replaced write_env_file_label() with WRITE_ENV_FILE_LABEL. 0dc39dffbd45 ("Use paths specified from environment variables for /etc configuration files") later reintroduced only src/shared/env-file-label.c. The header and meson entry were not restored, no callers use write_env_file_label() or write_vconsole_conf_label(), and the current write_env_file() signature no longer matches the stale wrapper. Remove the unbuilt source file again. Removed by: 3e5320e27d3e5f1bbbb7eb1c98dcec970d558017 Reintroduced by: 0dc39dffbd4525e79d7a1537b5c95780ba4f9727 Follow-up for: 0dc39dffbd4525e79d7a1537b5c95780ba4f9727 --- diff --git a/src/shared/env-file-label.c b/src/shared/env-file-label.c deleted file mode 100644 index c0c9668e9fe..00000000000 --- a/src/shared/env-file-label.c +++ /dev/null @@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ - -#include - -#include "env-file.h" -#include "env-file-label.h" -#include "locale-setup.h" -#include "selinux-util.h" - -int write_env_file_label(int dir_fd, const char *fname, char **headers, char **l) { - int r; - - r = mac_selinux_create_file_prepare(fname, S_IFREG); - if (r < 0) - return r; - - r = write_env_file(dir_fd, fname, headers, l); - - mac_selinux_create_file_clear(); - - return r; -} - -int write_vconsole_conf_label(char **l) { - int r; - - r = mac_selinux_create_file_prepare(etc_vconsole_conf(), S_IFREG); - if (r < 0) - return r; - - r = write_vconsole_conf(AT_FDCWD, etc_vconsole_conf(), l); - - mac_selinux_create_file_clear(); - - return r; -}