From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 9 Jul 2023 16:40:13 +0000 (+0800)
Subject: hibernate-resume: compare device nodes using path_equal_or_inode_same
X-Git-Tag: v254-rc2~59^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4427194292311fb9899eae1543effdcb09efa19b;p=thirdparty%2Fsystemd.git

hibernate-resume: compare device nodes using path_equal_or_inode_same

Follow-up for 9deeca127520b1098c3dfab9cdfd3b9c6bf983a4
---

diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
index 9d4c8704a3e..b6d3d257ac6 100644
--- a/src/hibernate-resume/hibernate-resume-generator.c
+++ b/src/hibernate-resume/hibernate-resume-generator.c
@@ -21,6 +21,7 @@
 #include "main-func.h"
 #include "os-util.h"
 #include "parse-util.h"
+#include "path-util.h"
 #include "proc-cmdline.h"
 #include "special.h"
 #include "string-util.h"
@@ -169,7 +170,7 @@ static int parse_efi_hibernate_location(void) {
                 arg_resume_device = TAKE_PTR(device);
                 arg_resume_offset = location.offset;
         } else {
-                if (!streq(arg_resume_device, device))
+                if (!path_equal_or_inode_same(arg_resume_device, device, 0))
                         log_warning("resume=%s doesn't match with HibernateLocation device '%s', proceeding anyway with resume=.",
                                     arg_resume_device, device);