diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-06 17:19:21 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-12-06 17:19:21 +0100 |
commit | 871fa294ff38b7fc0df7ddc2b03ec781d9f0cb8a (patch) | |
tree | e6832d12fd4f4a8120656ab07491cd0eb70de665 /src/machine | |
parent | f0a43eb821e7b6952977a92cd2ce8a2575f7101a (diff) | |
parent | 707b3fbd5732c630d1fd0bab6f6e5b8f7130b322 (diff) | |
download | systemd-871fa294ff38b7fc0df7ddc2b03ec781d9f0cb8a.tar.gz |
Merge pull request #10935 from poettering/rlimit-nofile-safe
Merged by hand to resolve a trivial conflict in TODO.
Diffstat (limited to 'src/machine')
-rw-r--r-- | src/machine/image-dbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c index 33a181e594..7e7f0d51bf 100644 --- a/src/machine/image-dbus.c +++ b/src/machine/image-dbus.c @@ -170,7 +170,7 @@ int bus_image_method_clone( if (pipe2(errno_pipe_fd, O_CLOEXEC|O_NONBLOCK) < 0) return sd_bus_error_set_errnof(error, errno, "Failed to create pipe: %m"); - r = safe_fork("(imgclone)", FORK_RESET_SIGNALS, &child); + r = safe_fork("(sd-imgclone)", FORK_RESET_SIGNALS, &child); if (r < 0) return sd_bus_error_set_errnof(error, r, "Failed to fork(): %m"); if (r == 0) { |