From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 2 Jan 2025 02:01:25 +0000 (+0900)
Subject: hostname: also read serial number from device tree
X-Git-Tag: v258-rc1~1711^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35797%2Fhead;p=thirdparty%2Fsystemd.git

hostname: also read serial number from device tree

This makes hostnamed try to read hardware serial number from
/proc/device-tree/serial-number.

Closes #35792.
---

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 883964f3565..4eddd57b512 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -84,6 +84,7 @@ typedef struct Context {
         sd_varlink_server *varlink_server;
         Hashmap *polkit_registry;
         sd_device *device_dmi;
+        sd_device *device_tree;
 } Context;
 
 static void context_reset(Context *c, uint64_t mask) {
@@ -106,6 +107,7 @@ static void context_destroy(Context *c) {
         sd_bus_flush_close_unref(c->bus);
         sd_varlink_server_unref(c->varlink_server);
         sd_device_unref(c->device_dmi);
+        sd_device_unref(c->device_tree);
 }
 
 static void context_read_etc_hostname(Context *c) {
@@ -232,6 +234,23 @@ static int context_acquire_dmi_device(Context *c) {
         return 1;
 }
 
+static int context_acquire_device_tree(Context *c) {
+        int r;
+
+        assert(c);
+        assert(!c->device_tree);
+
+        r = sd_device_new_from_path(&c->device_dmi, "/proc/device-tree/");
+        if (ERRNO_IS_NEG_DEVICE_ABSENT(r)) {
+                log_debug_errno(r, "Failed to open /proc/device-tree/ device, ignoring: %m");
+                return 0;
+        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to open /proc/device-tree/ device: %m");
+
+        return 1;
+}
+
 static bool string_is_safe_for_dbus(const char *s) {
         assert(s);
 
@@ -312,6 +331,10 @@ static int get_dmi_sysattr(Context *c, const char *key, char **ret) {
         return get_sysattr(ASSERT_PTR(c)->device_dmi, key, ret);
 }
 
+static int get_device_tree_sysattr(Context *c, const char *key, char **ret) {
+        return get_sysattr(ASSERT_PTR(c)->device_tree, key, ret);
+}
+
 static int get_hardware_serial(Context *c, char **ret) {
         int r;
 
@@ -324,7 +347,7 @@ static int get_hardware_serial(Context *c, char **ret) {
                         return r;
         }
 
-        return r;
+        return get_device_tree_sysattr(c, "serial-number", ret);
 }
 
 static int get_firmware_version(Context *c, char **ret) {
@@ -1761,6 +1784,10 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
+        r = context_acquire_device_tree(&context);
+        if (r < 0)
+                return r;
+
         r = sd_event_default(&context.event);
         if (r < 0)
                 return log_error_errno(r, "Failed to allocate event loop: %m");