From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Tue, 23 Jun 2020 14:56:33 +0000 (+0100)
Subject: portabled: create temp file for unit, not directory
X-Git-Tag: v246-rc1~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d88513e6b4fe36f59d3c5702a22ab796dea7852;p=thirdparty%2Fsystemd.git

portabled: create temp file for unit, not directory

open_tmpfile_linkable is used to create a temporary file in the same
directory as the target, but portabled uses the name of the parent
directory instead of the file it intends to create.
In other words, it creats a tmp for /etc/systemd/system.attached instead
of /etc/systemd/system.attached/foo.service.
It still works because it's later moved in the right place.
But as a side effect, it tries the create the file in the parent directory
which is /etc/systemd, and it case of read-only filesystems it fails.
---

diff --git a/src/portable/portable.c b/src/portable/portable.c
index 3dc6d9e4220..c7c11a48f24 100644
--- a/src/portable/portable.c
+++ b/src/portable/portable.c
@@ -877,7 +877,7 @@ static int attach_unit_file(
                 _cleanup_(unlink_and_freep) char *tmp = NULL;
                 _cleanup_close_ int fd = -1;
 
-                fd = open_tmpfile_linkable(where, O_WRONLY|O_CLOEXEC, &tmp);
+                fd = open_tmpfile_linkable(path, O_WRONLY|O_CLOEXEC, &tmp);
                 if (fd < 0)
                         return log_debug_errno(fd, "Failed to create unit file '%s': %m", path);