From 76f4ff9be85e57b0ca9b6e782a79740623c31571 Mon Sep 17 00:00:00 2001
From: dufuhang <dufuhang@kylinos.cn>
Date: Tue, 21 May 2024 17:03:17 +0800
Subject: [PATCH] main: pass the right error variable

---
 ...t-main-pass-the-right-error-variable.patch | 25 +++++++++++++++++++
 systemd.spec                                  |  6 ++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 backport-main-pass-the-right-error-variable.patch

diff --git a/backport-main-pass-the-right-error-variable.patch b/backport-main-pass-the-right-error-variable.patch
new file mode 100644
index 0000000..117d28a
--- /dev/null
+++ b/backport-main-pass-the-right-error-variable.patch
@@ -0,0 +1,25 @@
+From 56d0ed476290b51d8e3eb305a8fbfdfe7a873be8 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Tue, 21 May 2024 16:58:39 +0800
+Subject: [PATCH] main: pass the right error variable
+
+---
+ src/core/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/main.c b/src/core/main.c
+index 534c14a..a63e954 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -2517,7 +2517,7 @@ static void setenv_manager_environment(void) {
+ 
+                 r = putenv_dup(*p, true);
+                 if (r < 0)
+-                        log_warning_errno(errno, "Failed to setenv \"%s\", ignoring: %m", *p);
++                        log_warning_errno(r, "Failed to setenv \"%s\", ignoring: %m", *p);
+         }
+ }
+ 
+-- 
+2.27.0
+
diff --git a/systemd.spec b/systemd.spec
index 5fa7a8a..31d4038 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -25,7 +25,7 @@
 Name:           systemd
 Url:            https://systemd.io/
 Version:        255
-Release:        16
+Release:        17
 License:        MIT and LGPLv2+ and GPLv2+
 Summary:        System and Service Manager
 
@@ -66,6 +66,7 @@ Patch6012:      backport-unit-check-for-correct-function-in-vtable.patch
 Patch6013:      backport-fix-homed-log-message-typo-error.patch
 Patch6014:      backport-bash-completion-add-systemctl-service-log-level-target.patch
 Patch6015:      backport-fix-log-message-not-match-glob-patterns-passed-to-disable-command.patch
+Patch6016:	backport-main-pass-the-right-error-variable.patch
 
 Patch9008:      update-rtc-with-system-clock-when-shutdown.patch
 Patch9009:      udev-add-actions-while-rename-netif-failed.patch
@@ -1645,6 +1646,9 @@ fi
 %{_libdir}/security/pam_systemd_loadkey.so
 
 %changelog
+* Tue May 21 2024 dufuhang <dufuhang@kylinos.cn> - 255-17
+- main: pass the right error variable
+
 * Thu May 16 2024 Han Jinpeng <hanjinpeng@kylinos.cn> - 255-16
 - Fix log message print not match when glob patterns passed to disable service