From 42ba99748df4f12c0d855dd583fa89df1e2fbaa2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 2 Jun 2025 10:30:34 +0200 Subject: [PATCH] various: do not include file names directly in error messages git grep -l 'Failed to open /'|xargs sed -r -i 's|"Failed to open (/[^ ]+): %m"|"Failed to open %s: %m", "\1"|g' git grep -l $'Failed to open \'/'|xargs sed -r -i $'s|"Failed to open \'(/[^ ]+)\': %m"|"Failed to open %s: %m", "\\1"|g' git grep -l "Failed to open /"|xargs sed -r -i $'s|"Failed to open (/[^ ]+), ignoring: %m"|"Failed to open %s, ignoring: %m", "\\1"|g' + some manual fixups. --- src/basic/socket-util.c | 2 +- src/core/automount.c | 2 +- src/core/import-creds.c | 2 +- src/core/main.c | 2 +- src/core/manager.c | 2 +- src/core/namespace.c | 2 +- src/core/swap.c | 2 +- src/journal/bsod.c | 2 +- src/journal/journald-manager.c | 2 +- src/login/logind-dbus.c | 2 +- src/login/logind.c | 12 ++++++------ src/machine/machined.c | 2 +- src/network/networkctl-misc.c | 2 +- src/network/networkd-manager.c | 2 +- src/nsresourced/nsresourcework.c | 2 +- src/resolve/resolved-etc-hosts.c | 2 +- src/resolve/resolved-resolv-conf.c | 2 +- src/rfkill/rfkill.c | 2 +- src/shared/clean-ipc.c | 10 +++++----- src/shared/condition.c | 2 +- src/shared/exec-util.c | 2 +- src/shared/hibernate-util.c | 2 +- src/shared/killall.c | 2 +- src/shared/locale-setup.c | 2 +- src/shared/machine-id-setup.c | 10 +++++----- src/shared/mount-util.c | 4 ++-- src/shared/tpm2-util.c | 4 ++-- src/shutdown/detach-dm.c | 2 +- src/shutdown/shutdown.c | 2 +- src/shutdown/umount.c | 2 +- src/sleep/sleep.c | 2 +- src/storagetm/storagetm.c | 4 ++-- src/test/test-mount-util.c | 2 +- src/tmpfiles/tmpfiles.c | 2 +- src/udev/udev-builtin-btrfs.c | 2 +- src/udev/udev-watch.c | 4 ++-- src/userdb/userdbctl.c | 4 ++-- 37 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c index 194f8e22e88..d93d75e7c08 100644 --- a/src/basic/socket-util.c +++ b/src/basic/socket-util.c @@ -1930,7 +1930,7 @@ int vsock_get_local_cid(unsigned *ret) { vsock_fd = open("/dev/vsock", O_RDONLY|O_CLOEXEC); if (vsock_fd < 0) - return log_debug_errno(errno, "Failed to open /dev/vsock: %m"); + return log_debug_errno(errno, "Failed to open %s: %m", "/dev/vsock"); unsigned tmp; if (ioctl(vsock_fd, IOCTL_VM_SOCKETS_GET_LOCAL_CID, ret ?: &tmp) < 0) diff --git a/src/core/automount.c b/src/core/automount.c index e6b3dd09dba..b85177d04a4 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -344,7 +344,7 @@ static int open_dev_autofs(Manager *m) { m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY); if (m->dev_autofs_fd < 0) - return log_error_errno(errno, "Failed to open /dev/autofs: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/dev/autofs"); init_autofs_dev_ioctl(¶m); r = RET_NERRNO(ioctl(m->dev_autofs_fd, AUTOFS_DEV_IOCTL_VERSION, ¶m)); diff --git a/src/core/import-creds.c b/src/core/import-creds.c index e146faab91e..9a54196300f 100644 --- a/src/core/import-creds.c +++ b/src/core/import-creds.c @@ -626,7 +626,7 @@ static int import_credentials_initrd(ImportCredentialContext *c) { if (errno == ENOENT) log_debug_errno(errno, "No credentials passed from initrd."); else - log_warning_errno(errno, "Failed to open '/run/credentials/@initrd', ignoring: %m"); + log_warning_errno(errno, "Failed to open '%s', ignoring: %m", "/run/credentials/@initrd"); return 0; } diff --git a/src/core/main.c b/src/core/main.c index 330c42482f4..caff74cb34e 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -245,7 +245,7 @@ static int console_setup(void) { tty_fd = open_terminal("/dev/console", O_RDWR|O_NOCTTY|O_CLOEXEC); if (tty_fd < 0) - return log_error_errno(tty_fd, "Failed to open /dev/console: %m"); + return log_error_errno(tty_fd, "Failed to open %s: %m", "/dev/console"); /* We don't want to force text mode. Plymouth may be showing pictures already from initrd. */ reset_dev_console_fd(tty_fd, /* switch_to_text= */ false); diff --git a/src/core/manager.c b/src/core/manager.c index 981c2dc1471..818321702e6 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -497,7 +497,7 @@ static int manager_enable_special_signals(Manager *m) { fd = open_terminal("/dev/tty0", O_RDWR|O_NOCTTY|O_CLOEXEC); if (fd < 0) /* Support systems without virtual console (ENOENT) gracefully */ - log_full_errno(fd == -ENOENT ? LOG_DEBUG : LOG_WARNING, fd, "Failed to open /dev/tty0, ignoring: %m"); + log_full_errno(fd == -ENOENT ? LOG_DEBUG : LOG_WARNING, fd, "Failed to open %s, ignoring: %m", "/dev/tty0"); else { /* Enable that we get SIGWINCH on kbrequest */ if (ioctl(fd, KDSIGACCEPT, SIGWINCH) < 0) diff --git a/src/core/namespace.c b/src/core/namespace.c index 8226f894931..faa84ced20b 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -2264,7 +2264,7 @@ static int apply_mounts( if (reterr_path) *reterr_path = strdup("/proc/self/mountinfo"); - return log_debug_errno(r, "Failed to open /proc/self/mountinfo: %m"); + return log_debug_errno(r, "Failed to open %s: %m", "/proc/self/mountinfo"); } /* First round, establish all mounts we need */ diff --git a/src/core/swap.c b/src/core/swap.c index 27ac10e36d4..9146ae91069 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -1317,7 +1317,7 @@ static void swap_enumerate(Manager *m) { if (errno == ENOENT) log_debug_errno(errno, "Not swap enabled, skipping enumeration."); else - log_warning_errno(errno, "Failed to open /proc/swaps, ignoring: %m"); + log_warning_errno(errno, "Failed to open %s, ignoring: %m", "/proc/swaps"); return; } diff --git a/src/journal/bsod.c b/src/journal/bsod.c index 12a032efe73..9a370af3908 100644 --- a/src/journal/bsod.c +++ b/src/journal/bsod.c @@ -156,7 +156,7 @@ static int display_emergency_message_fullscreen(const char *message) { else { fd = open_terminal("/dev/tty1", O_RDWR|O_NOCTTY|O_CLOEXEC); if (fd < 0) - return log_error_errno(fd, "Failed to open /dev/tty1: %m"); + return log_error_errno(fd, "Failed to open %s: %m", "/dev/tty1"); r = find_next_free_vt(fd, &free_vt, &original_vt); if (r < 0) diff --git a/src/journal/journald-manager.c b/src/journal/journald-manager.c index bf3befee483..f6159fb2b66 100644 --- a/src/journal/journald-manager.c +++ b/src/journal/journald-manager.c @@ -2059,7 +2059,7 @@ static int manager_open_hostname(Manager *m) { m->hostname_fd = open("/proc/sys/kernel/hostname", O_RDONLY|O_CLOEXEC|O_NONBLOCK|O_NOCTTY); if (m->hostname_fd < 0) - return log_error_errno(errno, "Failed to open /proc/sys/kernel/hostname: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/proc/sys/kernel/hostname"); r = sd_event_add_io(m->event, &m->hostname_event_source, m->hostname_fd, 0, dispatch_hostname_change, m); if (r < 0) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index a0aa555ee04..a6d0bb189be 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1761,7 +1761,7 @@ static int flush_devices(Manager *m) { d = opendir("/etc/udev/rules.d"); if (!d) { if (errno != ENOENT) - log_warning_errno(errno, "Failed to open /etc/udev/rules.d: %m"); + log_warning_errno(errno, "Failed to open %s: %m", "/etc/udev/rules.d"); } else FOREACH_DIRENT_ALL(de, d, break) { if (!dirent_is_file(de)) diff --git a/src/login/logind.c b/src/login/logind.c index 93a1b66c3c4..adcf3065094 100644 --- a/src/login/logind.c +++ b/src/login/logind.c @@ -256,7 +256,7 @@ static int manager_enumerate_seats(Manager *m) { if (errno == ENOENT) return 0; - return log_error_errno(errno, "Failed to open /run/systemd/seats/: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/run/systemd/seats/"); } FOREACH_DIRENT(de, d, return -errno) { @@ -290,7 +290,7 @@ static int manager_enumerate_linger_users(Manager *m) { if (errno == ENOENT) return 0; - return log_error_errno(errno, "Failed to open /var/lib/systemd/linger/: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/var/lib/systemd/linger/"); } FOREACH_DIRENT(de, d, return -errno) { @@ -329,7 +329,7 @@ static int manager_enumerate_users(Manager *m) { if (errno == ENOENT) return 0; - return log_error_errno(errno, "Failed to open /run/systemd/users/: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/run/systemd/users/"); } FOREACH_DIRENT(de, d, return -errno) { @@ -537,7 +537,7 @@ static int manager_enumerate_sessions(Manager *m) { if (errno == ENOENT) return 0; - return log_error_errno(errno, "Failed to open /run/systemd/sessions/: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/run/systemd/sessions/"); } FOREACH_DIRENT(de, d, return -errno) { @@ -584,7 +584,7 @@ static int manager_enumerate_inhibitors(Manager *m) { if (errno == ENOENT) return 0; - return log_error_errno(errno, "Failed to open /run/systemd/inhibit/: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/run/systemd/inhibit/"); } FOREACH_DIRENT(de, d, return -errno) { @@ -889,7 +889,7 @@ static int manager_connect_console(Manager *m) { return 0; } - return log_error_errno(errno, "Failed to open /sys/class/tty/tty0/active: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/sys/class/tty/tty0/active"); } r = sd_event_add_io(m->event, &m->console_active_event_source, m->console_active_fd, 0, manager_dispatch_console, m); diff --git a/src/machine/machined.c b/src/machine/machined.c index 7f463f174bd..52fd69c6dac 100644 --- a/src/machine/machined.c +++ b/src/machine/machined.c @@ -179,7 +179,7 @@ static int manager_enumerate_machines(Manager *m) { if (errno == ENOENT) return 0; - return log_error_errno(errno, "Failed to open /run/systemd/machines: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/run/systemd/machines"); } FOREACH_DIRENT(de, d, return -errno) { diff --git a/src/network/networkctl-misc.c b/src/network/networkctl-misc.c index 6f658fdc942..e4021ee30d1 100644 --- a/src/network/networkctl-misc.c +++ b/src/network/networkctl-misc.c @@ -292,7 +292,7 @@ int verb_persistent_storage(int argc, char *argv[], void *userdata) { fd = open("/var/lib/systemd/network/", O_CLOEXEC | O_DIRECTORY); if (fd < 0) - return log_error_errno(errno, "Failed to open /var/lib/systemd/network/: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/var/lib/systemd/network/"); r = sd_varlink_push_fd(vl, fd); if (r < 0) diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c index c40d7fbff37..fad4d82183d 100644 --- a/src/network/networkd-manager.c +++ b/src/network/networkd-manager.c @@ -599,7 +599,7 @@ static int persistent_storage_open(void) { fd = open("/var/lib/systemd/network/", O_CLOEXEC | O_DIRECTORY); if (fd < 0) - return log_debug_errno(errno, "Failed to open /var/lib/systemd/network/, ignoring: %m"); + return log_debug_errno(errno, "Failed to open %s, ignoring: %m", "/var/lib/systemd/network/"); r = fd_is_read_only_fs(fd); if (r < 0) diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c index 5196a338de0..ebace9e22f5 100644 --- a/src/nsresourced/nsresourcework.c +++ b/src/nsresourced/nsresourcework.c @@ -1634,7 +1634,7 @@ static int create_tap( if (errno == ENOENT) /* Turn ENOENT → EOPNOTSUPP */ return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Network tap device node /dev/net/tun not found, cannot create network interface."); - return log_error_errno(errno, "Failed to open /dev/net/tun: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/dev/net/tun"); } if (ioctl(fd, TUNSETIFF, &ifr) < 0) diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c index 1b5d061e4ca..0ef33651f18 100644 --- a/src/resolve/resolved-etc-hosts.c +++ b/src/resolve/resolved-etc-hosts.c @@ -365,7 +365,7 @@ static int manager_etc_hosts_read(Manager *m) { f = fopen("/etc/hosts", "re"); if (!f) { if (errno != ENOENT) - return log_error_errno(errno, "Failed to open /etc/hosts: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/etc/hosts"); manager_etc_hosts_flush(m); return 0; diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c index c85d68c9840..0064adb948e 100644 --- a/src/resolve/resolved-resolv-conf.c +++ b/src/resolve/resolved-resolv-conf.c @@ -106,7 +106,7 @@ int manager_read_resolv_conf(Manager *m) { if (errno == ENOENT) return 0; - r = log_warning_errno(errno, "Failed to open /etc/resolv.conf: %m"); + r = log_warning_errno(errno, "Failed to open %s: %m", "/etc/resolv.conf"); goto clear; } diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index 3e3c20d6179..f5b67e5f01c 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -291,7 +291,7 @@ static int run(int argc, char *argv[]) { return 0; } - return log_error_errno(errno, "Failed to open /dev/rfkill: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/dev/rfkill"); } } else { c.rfkill_fd = SD_LISTEN_FDS_START; diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c index 28ee195e0d1..c9950d4d8a9 100644 --- a/src/shared/clean-ipc.c +++ b/src/shared/clean-ipc.c @@ -41,7 +41,7 @@ static int clean_sysvipc_shm(uid_t delete_uid, gid_t delete_gid, bool rm) { if (errno == ENOENT) return 0; - return log_warning_errno(errno, "Failed to open /proc/sysvipc/shm: %m"); + return log_warning_errno(errno, "Failed to open %s: %m", "/proc/sysvipc/shm"); } for (;;) { @@ -105,7 +105,7 @@ static int clean_sysvipc_sem(uid_t delete_uid, gid_t delete_gid, bool rm) { if (errno == ENOENT) return 0; - return log_warning_errno(errno, "Failed to open /proc/sysvipc/sem: %m"); + return log_warning_errno(errno, "Failed to open %s: %m", "/proc/sysvipc/sem"); } for (;;) { @@ -164,7 +164,7 @@ static int clean_sysvipc_msg(uid_t delete_uid, gid_t delete_gid, bool rm) { if (errno == ENOENT) return 0; - return log_warning_errno(errno, "Failed to open /proc/sysvipc/msg: %m"); + return log_warning_errno(errno, "Failed to open %s: %m", "/proc/sysvipc/msg"); } for (;;) { @@ -302,7 +302,7 @@ static int clean_posix_shm(uid_t uid, gid_t gid, bool rm) { if (errno == ENOENT) return 0; - return log_warning_errno(errno, "Failed to open /dev/shm: %m"); + return log_warning_errno(errno, "Failed to open %s: %m", "/dev/shm"); } return clean_posix_shm_internal("/dev/shm", dir, uid, gid, rm); @@ -317,7 +317,7 @@ static int clean_posix_mq(uid_t uid, gid_t gid, bool rm) { if (errno == ENOENT) return 0; - return log_warning_errno(errno, "Failed to open /dev/mqueue: %m"); + return log_warning_errno(errno, "Failed to open %s: %m", "/dev/mqueue"); } FOREACH_DIRENT_ALL(de, dir, goto fail) { diff --git a/src/shared/condition.c b/src/shared/condition.c index 61f900c59d8..14318667ec6 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -519,7 +519,7 @@ static int condition_test_firmware_devicetree_compatible(const char *dtcarg) { if (r < 0) { /* if the path doesn't exist it is incompatible */ if (r != -ENOENT) - log_debug_errno(r, "Failed to open() '%s', assuming machine is incompatible: %m", DTCOMPAT_FILE); + log_debug_errno(r, "Failed to open '%s', assuming machine is incompatible: %m", DTCOMPAT_FILE); return false; } diff --git a/src/shared/exec-util.c b/src/shared/exec-util.c index 83dbc6cbab5..771bbb762eb 100644 --- a/src/shared/exec-util.c +++ b/src/shared/exec-util.c @@ -590,7 +590,7 @@ int _fork_agent(const char *name, char * const *argv, const int except[], size_t * stdin around. */ fd = open_terminal("/dev/tty", stdin_is_tty ? O_WRONLY : (stdout_is_tty && stderr_is_tty) ? O_RDONLY : O_RDWR); if (fd < 0) { - log_error_errno(fd, "Failed to open /dev/tty: %m"); + log_error_errno(fd, "Failed to open %s: %m", "/dev/tty"); _exit(EXIT_FAILURE); } diff --git a/src/shared/hibernate-util.c b/src/shared/hibernate-util.c index de1fdfe9b5b..dca08599fbc 100644 --- a/src/shared/hibernate-util.c +++ b/src/shared/hibernate-util.c @@ -257,7 +257,7 @@ static int read_swap_entries(SwapEntries *ret) { f = fopen("/proc/swaps", "re"); if (!f) - return log_debug_errno(errno, "Failed to open /proc/swaps: %m"); + return log_debug_errno(errno, "Failed to open %s: %m", "/proc/swaps"); /* Remove header */ (void) fscanf(f, "%*s %*s %*s %*s %*s\n"); diff --git a/src/shared/killall.c b/src/shared/killall.c index 8735b4feda6..0a41d251ef6 100644 --- a/src/shared/killall.c +++ b/src/shared/killall.c @@ -235,7 +235,7 @@ static int killall(int sig, Set *pids, bool send_sighup) { r = proc_dir_open(&dir); if (r < 0) - return log_warning_errno(r, "Failed to open /proc/: %m"); + return log_warning_errno(r, "Failed to open %s: %m", "/proc/"); for (;;) { _cleanup_(pidref_done) PidRef pidref = PIDREF_NULL; diff --git a/src/shared/locale-setup.c b/src/shared/locale-setup.c index 4a2f21e4e18..c23f1c4078b 100644 --- a/src/shared/locale-setup.c +++ b/src/shared/locale-setup.c @@ -72,7 +72,7 @@ static int locale_context_load_conf(LocaleContext *c, LocaleLoadFlag flag) { if (fd == -ENOENT) return 0; if (fd < 0) - return log_debug_errno(errno, "Failed to open /etc/locale.conf: %m"); + return log_debug_errno(errno, "Failed to open %s: %m", "/etc/locale.conf"); if (fstat(fd, &st) < 0) return log_debug_errno(errno, "Failed to stat /etc/locale.conf: %m"); diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c index d4f12e4179e..3fe8cc74024 100644 --- a/src/shared/machine-id-setup.c +++ b/src/shared/machine-id-setup.c @@ -146,7 +146,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag r = chase("/etc/", root, CHASE_PREFIX_ROOT|CHASE_MKDIR_0755|CHASE_MUST_BE_DIRECTORY, &etc, &etc_fd); if (r < 0) - return log_error_errno(r, "Failed to open '/etc/': %m"); + return log_error_errno(r, "Failed to open %s: %m", "/etc/"); etc_machine_id = path_join(etc, "machine-id"); if (!etc_machine_id) @@ -251,7 +251,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag r = chase("/run/", root, CHASE_PREFIX_ROOT|CHASE_MKDIR_0755|CHASE_MUST_BE_DIRECTORY, &run, &run_fd); if (r < 0) - return log_error_errno(r, "Failed to open '/run/': %m"); + return log_error_errno(r, "Failed to open %s: %m", "/run/"); run_machine_id = path_join(run, "machine-id"); if (!run_machine_id) @@ -269,7 +269,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag } else { r = chase("/run/machine-id", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_REGULAR, &run_machine_id, /* ret_fd= */ NULL); if (r < 0) - return log_error_errno(r, "Failed to open '/run/machine-id': %m"); + return log_error_errno(r, "Failed to open %s: %m", "/run/machine-id"); } /* And now, let's mount it over */ @@ -322,7 +322,7 @@ int machine_id_commit(const char *root) { _cleanup_free_ char *etc = NULL; r = chase("/etc/", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_DIRECTORY, &etc, &etc_fd); if (r < 0) - return log_error_errno(r, "Failed to open /etc/: %m"); + return log_error_errno(r, "Failed to open %s: %m", "/etc/"); _cleanup_free_ char *etc_machine_id = path_join(etc, "machine-id"); if (!etc_machine_id) @@ -370,7 +370,7 @@ int machine_id_commit(const char *root) { _cleanup_close_ int etc_fd_again = -EBADF; r = chase("/etc/", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_DIRECTORY, /* ret_path= */ NULL, &etc_fd_again); if (r < 0) - return log_error_errno(r, "Failed to open /etc/: %m"); + return log_error_errno(r, "Failed to open %s: %m", "/etc/"); r = umountat_detach_verbose(LOG_ERR, etc_fd_again, "machine-id"); if (r < 0) diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c index 9a1cc31fac6..a29c8d78db7 100644 --- a/src/shared/mount-util.c +++ b/src/shared/mount-util.c @@ -45,7 +45,7 @@ int umount_recursive_full(const char *prefix, int flags, char **keep) { f = fopen("/proc/self/mountinfo", "re"); /* Pin the file, in case we unmount /proc/ as part of the logic here */ if (!f) - return log_debug_errno(errno, "Failed to open /proc/self/mountinfo: %m"); + return log_debug_errno(errno, "Failed to open %s: %m", "/proc/self/mountinfo"); for (;;) { _cleanup_(mnt_free_tablep) struct libmnt_table *table = NULL; @@ -454,7 +454,7 @@ int bind_remount_one(const char *path, unsigned long new_flags, unsigned long fl proc_self_mountinfo = fopen("/proc/self/mountinfo", "re"); if (!proc_self_mountinfo) - return log_debug_errno(errno, "Failed to open /proc/self/mountinfo: %m"); + return log_debug_errno(errno, "Failed to open %s: %m", "/proc/self/mountinfo"); return bind_remount_one_with_mountinfo(path, new_flags, flags_mask, proc_self_mountinfo); } diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c index 18d28015157..710ed4e81b1 100644 --- a/src/shared/tpm2-util.c +++ b/src/shared/tpm2-util.c @@ -6029,7 +6029,7 @@ int tpm2_list_devices(bool legend, bool quiet) { d = opendir("/sys/class/tpmrm"); if (!d) { - log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, "Failed to open /sys/class/tpmrm: %m"); + log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, "Failed to open %s: %m", "/sys/class/tpmrm"); if (errno != ENOENT) return -errno; } else { @@ -6099,7 +6099,7 @@ int tpm2_find_device_auto(char **ret) { d = opendir("/sys/class/tpmrm"); if (!d) { - log_debug_errno(errno, "Failed to open /sys/class/tpmrm: %m"); + log_debug_errno(errno, "Failed to open %s: %m", "/sys/class/tpmrm"); if (errno != ENOENT) return -errno; } else { diff --git a/src/shutdown/detach-dm.c b/src/shutdown/detach-dm.c index e6b3e808d32..ab75c3294fe 100644 --- a/src/shutdown/detach-dm.c +++ b/src/shutdown/detach-dm.c @@ -109,7 +109,7 @@ static int delete_dm(DeviceMapper *m) { fd = open("/dev/mapper/control", O_RDWR|O_CLOEXEC); if (fd < 0) - return log_debug_errno(errno, "Failed to open /dev/mapper/control: %m"); + return log_debug_errno(errno, "Failed to open %s: %m", "/dev/mapper/control"); return RET_NERRNO(ioctl(fd, DM_DEV_REMOVE, &(struct dm_ioctl) { .version = { diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 7ab4deac5e2..dccfff9ffe0 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -197,7 +197,7 @@ static int sync_making_progress(unsigned long long *prev_dirty) { f = fopen("/proc/meminfo", "re"); if (!f) - return log_warning_errno(errno, "Failed to open /proc/meminfo: %m"); + return log_warning_errno(errno, "Failed to open %s: %m", "/proc/meminfo"); for (;;) { _cleanup_free_ char *line = NULL; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 5f8f9d5754a..45c6db9245e 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -188,7 +188,7 @@ static void log_umount_blockers(const char *mnt) { _cleanup_closedir_ DIR *dir = opendir("/proc"); if (!dir) - return (void) log_warning_errno(errno, "Failed to open /proc/: %m"); + return (void) log_warning_errno(errno, "Failed to open %s: %m", "/proc/"); FOREACH_DIRENT_ALL(de, dir, break) { if (!IN_SET(de->d_type, DT_DIR, DT_UNKNOWN)) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 3f09d2272d3..3390ebe0c08 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -266,7 +266,7 @@ static int execute( /* This file is opened first, so that if we hit an error, we can abort before modifying any state. */ state_fd = open("/sys/power/state", O_WRONLY|O_CLOEXEC); if (state_fd < 0) - return log_error_errno(errno, "Failed to open /sys/power/state: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/sys/power/state"); if (sleep_needs_mem_sleep(sleep_config, operation)) { r = write_mode("/sys/power/mem_sleep", sleep_config->mem_modes); diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c index 71c87a46066..0a4f8541e90 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -420,7 +420,7 @@ static int nvme_subsystem_add(const char *node, int consumed_fd, sd_device *devi _cleanup_close_ int subsystems_fd = -EBADF; subsystems_fd = RET_NERRNO(open("/sys/kernel/config/nvmet/subsystems", O_DIRECTORY|O_CLOEXEC|O_RDONLY)); if (subsystems_fd < 0) - return log_error_errno(subsystems_fd, "Failed to open /sys/kernel/config/nvmet/subsystems: %m"); + return log_error_errno(subsystems_fd, "Failed to open %s: %m", "/sys/kernel/config/nvmet/subsystems"); _cleanup_close_ int subsystem_fd = -EBADF; subsystem_fd = open_mkdir_at(subsystems_fd, j, O_EXCL|O_RDONLY|O_CLOEXEC, 0777); @@ -635,7 +635,7 @@ static int nvme_port_add(const char *name, int ip_family, NvmePort **ret) { _cleanup_close_ int ports_fd = -EBADF; ports_fd = RET_NERRNO(open("/sys/kernel/config/nvmet/ports", O_DIRECTORY|O_RDONLY|O_CLOEXEC)); if (ports_fd < 0) - return log_error_errno(ports_fd, "Failed to open /sys/kernel/config/nvmet/ports: %m"); + return log_error_errno(ports_fd, "Failed to open %s: %m", "/sys/kernel/config/nvmet/ports"); _cleanup_close_ int port_fd = -EBADF; uint16_t portnr = calculate_start_port(name, ip_family); diff --git a/src/test/test-mount-util.c b/src/test/test-mount-util.c index a7fc06bbe14..fb2cab3da81 100644 --- a/src/test/test-mount-util.c +++ b/src/test/test-mount-util.c @@ -382,7 +382,7 @@ TEST(umount_recursive) { /* Open /p/s/m file before we unmount everything (which might include /proc/) */ f = fopen("/proc/self/mountinfo", "re"); if (!f) { - log_error_errno(errno, "Failed to open /proc/self/mountinfo: %m"); + log_error_errno(errno, "Failed to open %s: %m", "/proc/self/mountinfo"); _exit(EXIT_FAILURE); } diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 5d51d9ae4fd..a11a90b93bc 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -466,7 +466,7 @@ static int load_unix_sockets(Context *c) { f = fopen("/proc/net/unix", "re"); if (!f) return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_WARNING, errno, - "Failed to open /proc/net/unix, ignoring: %m"); + "Failed to open %s, ignoring: %m", "/proc/net/unix"); /* Skip header */ r = read_line(f, LONG_LINE_MAX, NULL); diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c index 7a9dc7747c8..4b5a5fc610e 100644 --- a/src/udev/udev-builtin-btrfs.c +++ b/src/udev/udev-builtin-btrfs.c @@ -43,7 +43,7 @@ static int builtin_btrfs(UdevEvent *event, int argc, char *argv[]) { return 0; } - return log_device_debug_errno(dev, errno, "Failed to open /dev/btrfs-control: %m"); + return log_device_debug_errno(dev, errno, "Failed to open %s: %m", "/dev/btrfs-control"); } struct btrfs_ioctl_vol_args args = {}; diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 5f77b4e7080..49cae657251 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -415,7 +415,7 @@ static int udev_watch_clear_by_wd(sd_device *dev, int dirfd, int wd) { if (dirfd < 0) { dirfd_close = RET_NERRNO(open("/run/udev/watch/", O_CLOEXEC | O_DIRECTORY | O_NOFOLLOW | O_RDONLY)); if (dirfd_close < 0) - return log_device_debug_errno(dev, dirfd_close, "Failed to open '/run/udev/watch/': %m"); + return log_device_debug_errno(dev, dirfd_close, "Failed to open %s: %m", "/run/udev/watch/"); dirfd = dirfd_close; } @@ -595,7 +595,7 @@ int manager_remove_watch(Manager *manager, sd_device *dev) { if (dirfd == -ENOENT) return 0; if (dirfd < 0) - return log_device_debug_errno(dev, dirfd, "Failed to open '/run/udev/watch/': %m"); + return log_device_debug_errno(dev, dirfd, "Failed to open %s: %m", "/run/udev/watch/"); /* First, clear symlinks. */ r = udev_watch_clear(dev, dirfd, &wd); diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c index 2d405197dc2..47e6f24ece0 100644 --- a/src/userdb/userdbctl.c +++ b/src/userdb/userdbctl.c @@ -1040,7 +1040,7 @@ static int display_services(int argc, char *argv[], void *userdata) { return 0; } - return log_error_errno(errno, "Failed to open /run/systemd/userdb/: %m"); + return log_error_errno(errno, "Failed to open %s: %m", "/run/systemd/userdb/"); } t = table_new("service", "listening"); @@ -1461,7 +1461,7 @@ static int load_credentials(int argc, char *argv[], void *userdata) { /* xopen_flags= */ XO_LABEL, /* mode= */ 0755); if (userdb_dir_fd < 0) - return log_error_errno(userdb_dir_fd, "Failed to open '/etc/userdb/': %m"); + return log_error_errno(userdb_dir_fd, "Failed to open %s: %m", "/etc/userdb/"); FOREACH_ARRAY(i, des->entries, des->n_entries) { struct dirent *de = *i; -- 2.47.3