shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-04 17:47:03 +03:00
Code

Merge pull request #25672 from jelly/FirwmwareName

Browse Source 
Extend hostnamed DMI firmware properties
This commit is contained in:
Yu Watanabe 2022-12-08 16:04:36 +09:00 committed by GitHub
commit 2e83783030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
man/org.freedesktop.hostname1.xml
View File

@ -89,6 +89,10 @@ node /org/freedesktop/hostname1 {
readonly s HardwareModel = '...';
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s FirmwareVersion = '...';
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s FirmwareVendor = '...';
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s FirmwareDate = '...';
};
interface org.freedesktop.DBus.Peer { ... };
interface org.freedesktop.DBus.Introspectable { ... };
@ -104,6 +108,10 @@ node /org/freedesktop/hostname1 {
<!--property FirmwareVersion is not documented!-->
<!--property FirmwareVendor is not documented!-->
<!--property FirmwareDate is not documented!-->
<!--Autogenerated cross-references for systemd.directives, do not edit-->
<variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.hostname1"/>
@ -166,6 +174,10 @@ node /org/freedesktop/hostname1 {
<variablelist class="dbus-property" generated="True" extra-ref="FirmwareVersion"/>
<variablelist class="dbus-property" generated="True" extra-ref="FirmwareVendor"/>
<variablelist class="dbus-property" generated="True" extra-ref="FirmwareDate"/>
<!--End of Autogenerated section-->
<para>Whenever the hostname or other metadata is changed via the daemon,

48
src/hostname/hostnamed.c
View File

@ -246,6 +246,14 @@ static int get_firmware_version(char **ret) {
return get_hardware_firmware_data("bios_version", ret);
}
static int get_firmware_vendor(char **ret) {
return get_hardware_firmware_data("bios_vendor", ret);
}
static int get_firmware_date(char **ret) {
return get_hardware_firmware_data("bios_date", ret);
}
static const char* valid_chassis(const char *chassis) {
assert(chassis);
@ -628,6 +636,37 @@ static int property_get_firmware_version(
return sd_bus_message_append(reply, "s", firmware_version);
}
static int property_get_firmware_vendor(
sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error) {
_cleanup_free_ char *firmware_vendor = NULL;
(void) get_firmware_vendor(&firmware_vendor);
return sd_bus_message_append(reply, "s", firmware_vendor);
}
static int property_get_firmware_date(
sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error) {
_cleanup_free_ char *firmware_date = NULL;
(void) get_firmware_date(&firmware_date);
return sd_bus_message_append(reply, "s", firmware_date);
}
static int property_get_hostname(
sd_bus *bus,
const char *path,
@ -1149,7 +1188,8 @@ static int method_get_hardware_serial(sd_bus_message *m, void *userdata, sd_bus_
static int method_describe(sd_bus_message *m, void *userdata, sd_bus_error *error) {
_cleanup_free_ char *hn = NULL, *dhn = NULL, *in = NULL, *text = NULL,
*chassis = NULL, *vendor = NULL, *model = NULL, *serial = NULL, *firmware_version = NULL;
*chassis = NULL, *vendor = NULL, *model = NULL, *serial = NULL, *firmware_version = NULL,
*firmware_vendor = NULL, *firmware_date = NULL;
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
_cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
sd_id128_t product_uuid = SD_ID128_NULL;
@ -1213,6 +1253,8 @@ static int method_describe(sd_bus_message *m, void *userdata, sd_bus_error *erro
(void) get_hardware_serial(&serial);
}
(void) get_firmware_version(&firmware_version);
(void) get_firmware_vendor(&firmware_vendor);
(void) get_firmware_date(&firmware_date);
r = json_build(&v, JSON_BUILD_OBJECT(
JSON_BUILD_PAIR("Hostname", JSON_BUILD_STRING(hn)),
@ -1234,6 +1276,8 @@ static int method_describe(sd_bus_message *m, void *userdata, sd_bus_error *erro
JSON_BUILD_PAIR("HardwareModel", JSON_BUILD_STRING(model ?: c->data[PROP_HARDWARE_MODEL])),
JSON_BUILD_PAIR("HardwareSerial", JSON_BUILD_STRING(serial)),
JSON_BUILD_PAIR("FirmwareVersion", JSON_BUILD_STRING(firmware_version)),
JSON_BUILD_PAIR("FirmwareVendor", JSON_BUILD_STRING(firmware_vendor)),
JSON_BUILD_PAIR("FirmwareDate", JSON_BUILD_STRING(firmware_date)),
JSON_BUILD_PAIR_CONDITION(!sd_id128_is_null(product_uuid), "ProductUUID", JSON_BUILD_ID128(product_uuid)),
JSON_BUILD_PAIR_CONDITION(sd_id128_is_null(product_uuid), "ProductUUID", JSON_BUILD_NULL)));
@ -1275,6 +1319,8 @@ static const sd_bus_vtable hostname_vtable[] = {
SD_BUS_PROPERTY("HardwareVendor", "s", property_get_hardware_vendor, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("HardwareModel", "s", property_get_hardware_model, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("FirmwareVersion", "s", property_get_firmware_version, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("FirmwareVendor", "s", property_get_firmware_vendor, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("FirmwareDate", "s", property_get_firmware_date, 0, SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_METHOD_WITH_ARGS("SetHostname",
SD_BUS_ARGS("s", hostname, "b", interactive),