From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 9 Nov 2021 01:28:43 +0000 (+0900)
Subject: condition: use /proc/device-tree/
X-Git-Tag: v250-rc1~309^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6dce5720c409129319ccd26e4d1b7f8a17cc563;p=thirdparty%2Fsystemd.git

condition: use /proc/device-tree/
---

diff --git a/src/shared/condition.c b/src/shared/condition.c
index 1d28f7ba579..3e6ae795535 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -509,7 +509,7 @@ static int condition_test_architecture(Condition *c, char **env) {
         return a == b;
 }
 
-#define DTCOMPAT_FILE "/sys/firmware/devicetree/base/compatible"
+#define DTCOMPAT_FILE "/proc/device-tree/compatible"
 static int condition_test_firmware_devicetree_compatible(const char *dtcarg) {
         int r;
         _cleanup_free_ char *dtcompat = NULL;
@@ -530,11 +530,8 @@ static int condition_test_firmware_devicetree_compatible(const char *dtcarg) {
                 return false;
         }
 
-        /*
-         * /sys/firmware/devicetree/base/compatible consists of one or more
-         * strings, each ending in '\0'. So the last character in dtcompat must
-         * be a '\0'.
-         */
+         /* /proc/device-tree/compatible consists of one or more strings, each ending in '\0'.
+          * So the last character in dtcompat must be a '\0'. */
         if (dtcompat[size - 1] != '\0') {
                 log_debug("%s is in an unknown format, assuming machine is incompatible", DTCOMPAT_FILE);
                 return false;