forked from pool/systemd
bbba62be60
- Add or port upstream bugfix patches: 0001-Fix-systemd-stdio-bridge-symlink.patch 0002-execute-free-directory-path-if-we-fail-to-remove-it-.patch 0003-Do-not-print-invalid-UTF-8-in-error-messages.patch 0004-man-document-missing-options-of-systemd-run.patch 0005-systemd-run-add-some-extra-safety-checks.patch 0006-journal-assume-that-next-entry-is-after-previous-ent.patch 0007-journal-forget-file-after-encountering-an-error.patch 0008-core-correctly-unregister-PIDs-from-PID-hashtables.patch 0009-logind-fix-reference-to-systemd-user-sessions.servic.patch 0010-man-update-link-to-LSB.patch 0011-man-systemd-bootchart-fix-spacing-in-command.patch 0012-man-add-missing-comma.patch 0013-units-Do-not-unescape-instance-name-in-systemd-backl.patch - Add linker scripts as place holder of the old systemd shared libraries now all included in libsystemd.so (bnc#867128) - Make patch 1006-udev-always-rename-network.patch work again and add it again. - address missing owner functionality in systemd-tmpfiles (fate#314974) 1022-systemd-tmpfiles-ownerkeep.patch - Generate the bash completion files on the fly for the case of not having the package bash-completion around - Add or port upstream bugfix patches: 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch 0002-cdrom_id-use-the-old-MMC-fallback.patch 0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch OBS-URL: https://build.opensuse.org/request/show/225408 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=177
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From 98b47d54ce946ad3524f84eb38d2413498a333dc Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Mon, 3 Mar 2014 17:11:39 +0100
|
|
Subject: [PATCH] execute: free directory path if we fail to remove it because
|
|
we cannot allocate a thread
|
|
|
|
---
|
|
src/core/execute.c | 18 ++++++++++++++++--
|
|
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
|
diff --git src/core/execute.c src/core/execute.c
|
|
index 9de6e87..3312885 100644
|
|
--- src/core/execute.c
|
|
+++ src/core/execute.c
|
|
@@ -2713,6 +2713,8 @@ static void *remove_tmpdir_thread(void *p) {
|
|
}
|
|
|
|
void exec_runtime_destroy(ExecRuntime *rt) {
|
|
+ int r;
|
|
+
|
|
if (!rt)
|
|
return;
|
|
|
|
@@ -2722,13 +2724,25 @@ void exec_runtime_destroy(ExecRuntime *rt) {
|
|
|
|
if (rt->tmp_dir) {
|
|
log_debug("Spawning thread to nuke %s", rt->tmp_dir);
|
|
- asynchronous_job(remove_tmpdir_thread, rt->tmp_dir);
|
|
+
|
|
+ r = asynchronous_job(remove_tmpdir_thread, rt->tmp_dir);
|
|
+ if (r < 0) {
|
|
+ log_warning("Failed to nuke %s: %s", rt->tmp_dir, strerror(-r));
|
|
+ free(rt->tmp_dir);
|
|
+ }
|
|
+
|
|
rt->tmp_dir = NULL;
|
|
}
|
|
|
|
if (rt->var_tmp_dir) {
|
|
log_debug("Spawning thread to nuke %s", rt->var_tmp_dir);
|
|
- asynchronous_job(remove_tmpdir_thread, rt->var_tmp_dir);
|
|
+
|
|
+ r = asynchronous_job(remove_tmpdir_thread, rt->var_tmp_dir);
|
|
+ if (r < 0) {
|
|
+ log_warning("Failed to nuke %s: %s", rt->var_tmp_dir, strerror(-r));
|
|
+ free(rt->var_tmp_dir);
|
|
+ }
|
|
+
|
|
rt->var_tmp_dir = NULL;
|
|
}
|
|
|
|
--
|
|
1.7.9.2
|
|
|