]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
hostnamed: use /proc/device-tree to get chassis type
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 9 Nov 2021 01:21:23 +0000 (10:21 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 10 Nov 2021 19:42:50 +0000 (04:42 +0900)
From https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-firmware-ofw
---
Userspace must not use the /sys/firmware/devicetree/base
path directly, but instead should follow /proc/device-tree
symlink. It is possible that the absolute path will change
in the future, but the symlink is the stable ABI.
---

Addresses the comment https://github.com/systemd/systemd/pull/20731#discussion_r744095262.

src/hostname/hostnamed.c

index bcd244986198797cb90a24f7e81245236a021608..e2c9f8ab677755f2097ce7635b8029a6df20eb5d 100644 (file)
@@ -302,7 +302,7 @@ try_acpi:
         }
 
 try_devicetree:
-        r = read_one_line_file("/sys/firmware/devicetree/base/chassis-type", &type);
+        r = read_one_line_file("/proc/device-tree/chassis-type", &type);
         if (r < 0) {
                 log_debug_errno(r, "Failed to read device-tree chassis type, ignoring: %m");
                 return NULL;