From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 14 Mar 2022 07:01:23 +0000 (+0900)
Subject: home: use open_image_file() helper at one more place
X-Git-Tag: v251-rc1~142^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F22746%2Fhead;p=thirdparty%2Fsystemd.git

home: use open_image_file() helper at one more place
---

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.");