From 6733e20cb0683c8512de2a1cd3daf64960800498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Sj=C3=B6lund?= Date: Sun, 1 Feb 2026 09:09:23 +0100 Subject: [PATCH] linux: use crun_error_wrap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggestion by gemini-code-assist in https://github.com/containers/crun/pull/1971 was amended. Signed-off-by: Erik Sjölund --- src/libcrun/linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c index 6933054b71..73423ff36e 100644 --- a/src/libcrun/linux.c +++ b/src/libcrun/linux.c @@ -2345,7 +2345,7 @@ process_single_mount (libcrun_container_t *container, const char *rootfs, dfd = safe_openat (get_private_data (container)->rootfsfd, rootfs, target, O_RDONLY | O_PATH | O_CLOEXEC | (is_dir ? O_DIRECTORY : 0), 0, err); if (UNLIKELY (dfd < 0)) - return crun_make_error (err, errno, "open mount target `/%s`", target); + return crun_error_wrap (err, "open mount target `/%s`", target); ret = do_mount_setattr (true, target, dfd, rec_clear, rec_set, err); if (UNLIKELY (ret < 0)) @@ -2722,7 +2722,7 @@ libcrun_set_mounts (struct container_entrypoint_s *entrypoint_args, libcrun_cont // configure handler mounts ret = libcrun_container_notify_handler (entrypoint_args, HANDLER_CONFIGURE_MOUNTS, container, rootfs, err); if (UNLIKELY (ret < 0)) - return crun_make_error (err, errno, "failed configuring mounts for handler at phase: HANDLER_CONFIGURE_MOUNTS"); + return crun_error_wrap (err, "failed configuring mounts for handler at phase: HANDLER_CONFIGURE_MOUNTS"); if (def->root->readonly) { @@ -2817,7 +2817,7 @@ libcrun_finalize_mounts (struct container_entrypoint_s *entrypoint_args, libcrun // configure handler mounts for phase: HANDLER_CONFIGURE_AFTER_MOUNTS ret = libcrun_container_notify_handler (entrypoint_args, HANDLER_CONFIGURE_AFTER_MOUNTS, container, rootfs, err); if (UNLIKELY (ret < 0)) - return crun_make_error (err, errno, "failed configuring mounts for handler at phase: HANDLER_CONFIGURE_AFTER_MOUNTS"); + return crun_error_wrap (err, "failed configuring mounts for handler at phase: HANDLER_CONFIGURE_AFTER_MOUNTS"); close_and_reset (&(get_private_data (container)->rootfsfd));