From: Daniel Braunwarth <daniel@braunwarth.dev>
Date: Sun, 28 Aug 2022 18:02:50 +0000 (+0200)
Subject: condition: fix device-tree firmware path
X-Git-Tag: v252-rc1~305
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1037178acfd093fb10d8f5e74f3072f78afdf7e8;p=thirdparty%2Fsystemd.git

condition: fix device-tree firmware path

The path /sys/firmware/device-tree doesn't exist. This should be either
/proc/device-tree or /sys/firmware/devicetree.

The first path is only a link. So lets use the second path.

See https://github.com/torvalds/linux/blob/v4.14/drivers/of/base.c#L218.
---

diff --git a/src/shared/condition.c b/src/shared/condition.c
index 5c6e383679f..27a0a465be6 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -649,9 +649,9 @@ static int condition_test_firmware(Condition *c, char **env) {
         assert(c->type == CONDITION_FIRMWARE);
 
         if (streq(c->parameter, "device-tree")) {
-                if (access("/sys/firmware/device-tree/", F_OK) < 0) {
+                if (access("/sys/firmware/devicetree/", F_OK) < 0) {
                         if (errno != ENOENT)
-                                log_debug_errno(errno, "Unexpected error when checking for /sys/firmware/device-tree/: %m");
+                                log_debug_errno(errno, "Unexpected error when checking for /sys/firmware/devicetree/: %m");
                         return false;
                 } else
                         return true;