From 172e3817b084f3d097dd8a5699bf0b11e36ae8f5 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 14 Mar 2022 16:01:23 +0900 Subject: [PATCH] home: use open_image_file() helper at one more place --- src/home/homework-luks.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index a7e53013ed3..38164fadc34 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -2200,12 +2200,10 @@ int home_create_luks( /* Let's place the home directory on a real device, i.e. an USB stick or such */ - setup->image_fd = open(ip, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); + setup->image_fd = open_image_file(h, ip, &st); if (setup->image_fd < 0) - return log_error_errno(errno, "Failed to open device %s: %m", ip); + return setup->image_fd; - if (fstat(setup->image_fd, &st) < 0) - return log_error_errno(errno, "Failed to stat device %s: %m", ip); if (!S_ISBLK(st.st_mode)) return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK), "Device is not a block device, refusing."); -- 2.47.3