summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Palus <jpalus@fastmail.com>2021-07-08 00:23:21 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-07-20 18:00:59 +0200
commit46e192213df8d3f86f0f542cdd975d505a3ce37c (patch)
treea08c3ddc4d19132c9fda0476e31969a17fd863c5
parent3f96f2a741e6f123b9f0a8dffed72eeea45dda78 (diff)
downloadsystemd-46e192213df8d3f86f0f542cdd975d505a3ce37c.tar.gz
hostnamed: correct variable with errno in fallback_chassis
fixes assertion failure on arm: systemd-hostnamed[642]: Assertion '(_error) != 0' failed at src/hostname/hostnamed.c:207, function fallback_chassis(). Aborting. (cherry picked from commit 105a4245ff13d588e1e848e8ee3cffd6185bd0ae) (cherry picked from commit 4a44597bdd725f504ebd520b0deef7797dc46daa)
-rw-r--r--src/hostname/hostnamed.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index a1794bdab1..82cef660ad 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -198,14 +198,14 @@ static const char* fallback_chassis(void) {
r = read_one_line_file("/sys/class/dmi/id/chassis_type", &type);
if (r < 0) {
- log_debug_errno(v, "Failed to read DMI chassis type, ignoring: %m");
+ log_debug_errno(r, "Failed to read DMI chassis type, ignoring: %m");
goto try_acpi;
}
r = safe_atou(type, &t);
free(type);
if (r < 0) {
- log_debug_errno(v, "Failed to parse DMI chassis type, ignoring: %m");
+ log_debug_errno(r, "Failed to parse DMI chassis type, ignoring: %m");
goto try_acpi;
}
@@ -254,14 +254,14 @@ static const char* fallback_chassis(void) {
try_acpi:
r = read_one_line_file("/sys/firmware/acpi/pm_profile", &type);
if (r < 0) {
- log_debug_errno(v, "Failed read ACPI PM profile, ignoring: %m");
+ log_debug_errno(r, "Failed read ACPI PM profile, ignoring: %m");
return NULL;
}
r = safe_atou(type, &t);
free(type);
if (r < 0) {
- log_debug_errno(v, "Failed parse ACPI PM profile, ignoring: %m");
+ log_debug_errno(r, "Failed parse ACPI PM profile, ignoring: %m");
return NULL;
}