diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
commit | b49088575eb777ced2551f484da86317332d6087 (patch) | |
tree | bf9a151cf2d61956340d555659ffc098ee1da466 /sys-apps/systemd/files | |
parent | 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff) |
gentoo resync : 24.07.2021
Diffstat (limited to 'sys-apps/systemd/files')
-rw-r--r-- | sys-apps/systemd/files/249-hostnamed-error-variable.patch | 50 | ||||
-rw-r--r-- | sys-apps/systemd/files/gentoo-pam.patch | 33 |
2 files changed, 0 insertions, 83 deletions
diff --git a/sys-apps/systemd/files/249-hostnamed-error-variable.patch b/sys-apps/systemd/files/249-hostnamed-error-variable.patch deleted file mode 100644 index 7fe7af73a003..000000000000 --- a/sys-apps/systemd/files/249-hostnamed-error-variable.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 105a4245ff13d588e1e848e8ee3cffd6185bd0ae Mon Sep 17 00:00:00 2001 -From: Jan Palus <jpalus@fastmail.com> -Date: Thu, 8 Jul 2021 00:23:21 +0200 -Subject: [PATCH] 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. ---- - src/hostname/hostnamed.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index bd535ddc4d80..36702f2fb0cd 100644 ---- a/src/hostname/hostnamed.c -+++ b/src/hostname/hostnamed.c -@@ -204,14 +204,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; - } - -@@ -260,14 +260,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; - } - diff --git a/sys-apps/systemd/files/gentoo-pam.patch b/sys-apps/systemd/files/gentoo-pam.patch deleted file mode 100644 index 4d022b508ba6..000000000000 --- a/sys-apps/systemd/files/gentoo-pam.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b744751e2ced66c2ec191e8bd490cb9bdffc630a Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Tue, 3 Nov 2020 10:42:51 -0500 -Subject: [PATCH] pam: include system-auth for systemd --user - ---- - src/login/systemd-user.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4 -index f6313f79fe..bcf84b4c64 100644 ---- a/src/login/systemd-user.m4 -+++ b/src/login/systemd-user.m4 -@@ -5,7 +5,7 @@ - m4_ifdef(`ENABLE_HOMED', - -account sufficient pam_systemd_home.so - )m4_dnl --account sufficient pam_unix.so -+account include system-auth - account required pam_permit.so - - m4_ifdef(`HAVE_SELINUX', -@@ -13,6 +13,7 @@ session required pam_selinux.so close - session required pam_selinux.so nottys open - )m4_dnl - session required pam_loginuid.so -+session include system-auth - session optional pam_keyinit.so force revoke - m4_ifdef(`ENABLE_HOMED', - -session optional pam_systemd_home.so --- -2.29.0 - |