Merge pull request #21273 from yuwata/hostname-device-tree

hostnamed: use /proc/device-tree to get chassis type

src/hostname/hostnamed.c

@@ -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;

src/libsystemd/sd-id128/id128-util.c

@@ -219,7 +219,7 @@ int id128_get_product(sd_id128_t *ret) {
 
         r = id128_read("/sys/class/dmi/id/product_uuid", ID128_UUID, &uuid);
         if (r == -ENOENT)
-                r = id128_read("/sys/firmware/devicetree/base/vm,uuid", ID128_UUID, &uuid);
+                r = id128_read("/proc/device-tree/vm,uuid", ID128_UUID, &uuid);
         if (r < 0)
                 return r;
 

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;
         }
 
-        /*
+         /* /proc/device-tree/compatible consists of one or more strings, each ending in '\0'.
-         * /sys/firmware/devicetree/base/compatible consists of one or more
+          * So the last character in dtcompat must be a '\0'. */
-         * 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;

src/shared/netif-util.c

@@ -67,7 +67,7 @@ int net_get_unique_predictable_data(sd_device *device, bool use_sysname, uint64_
 
         log_device_debug(device, "Using \"%s\" as stable identifying information", name);
 
-        return net_get_unique_predictable_data_from_name(name, NULL, ret);
+        return net_get_unique_predictable_data_from_name(name, &HASH_KEY, ret);
 }
 
 int net_get_unique_predictable_data_from_name(
@@ -80,11 +80,9 @@ int net_get_unique_predictable_data_from_name(
         int r;
 
         assert(name);
+        assert(key);
         assert(ret);
 
-        if (!key)
-                key = &HASH_KEY;
-
         l = strlen(name);
         sz = sizeof(sd_id128_t) + l;
         v = newa(uint8_t, sz);