Attachment 940294 Details for Bug 1145108 – patch

[patch] patch

0001-Fix-systemd-nspawn-with-u-1145108.patch (text/plain), 3.24 KB, created by Jan Synacek on 2014-09-23 07:12:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Synacek

Created: 2014-09-23 07:12:42 UTC

Size: 3.24 KB

patch

obsolete

>From 61a00cbad32e31c91938c4c0848a9ec15d0c7e5c Mon Sep 17 00:00:00 2001
>From: Jan Synacek <jsynacek@redhat.com>
>Date: Mon, 22 Sep 2014 14:37:57 +0200
>Subject: [PATCH] Fix systemd-nspawn with -u (#1145108)
>
>---
> 0522-nspawn-allow-EEXIST-on-mkdir_safe_label.patch | 29 ++++++++++++++++++++++
> systemd.spec                                       |  6 ++++-
> 2 files changed, 34 insertions(+), 1 deletion(-)
> create mode 100644 0522-nspawn-allow-EEXIST-on-mkdir_safe_label.patch
>
>diff --git a/0522-nspawn-allow-EEXIST-on-mkdir_safe_label.patch b/0522-nspawn-allow-EEXIST-on-mkdir_safe_label.patch
>new file mode 100644
>index 0000000..46e0fb0
>--- /dev/null
>+++ b/0522-nspawn-allow-EEXIST-on-mkdir_safe_label.patch
>@@ -0,0 +1,29 @@
>+From f418f31d5042398344740f2d8ac4dc1c2583151c Mon Sep 17 00:00:00 2001
>+From: Brandon Philips <brandon.philips@coreos.com>
>+Date: Thu, 13 Mar 2014 15:19:40 -0700
>+Subject: [PATCH] nspawn: allow -EEXIST on mkdir_safe /home/${uid}
>+
>+With systemd 211 nspawn attempts to create the home directory for the
>+given uid. However, if the home directory already exists then it will
>+fail. Don't error out on -EEXIST.
>+---
>+ Backported-by: Jan Synacek <jsynacek@redhat.com>
>+ Resolves: #1145108
>+
>+ src/nspawn/nspawn.c | 2 +-
>+ 1 file changed, 1 insertion(+), 1 deletion(-)
>+
>+diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
>+index b637b51..7c3d7b8 100644
>+--- a/src/nspawn/nspawn.c
>++++ b/src/nspawn/nspawn.c
>+@@ -1569,7 +1569,7 @@ int main(int argc, char *argv[]) {
>+                                         goto child_fail;
>+                                 }
>+ 
>+-                                if (mkdir_safe_label(home, 0775, uid, gid) < 0) {
>++                                if (mkdir_safe_label(home, 0775, uid, gid) < 0 && errno != EEXIST) {
>+                                         log_error("mkdir_safe_label() failed: %m");
>+                                         goto child_fail;
>+                                 }
>+
>diff --git a/systemd.spec b/systemd.spec
>index 21d61e5..0ef2adb 100644
>--- a/systemd.spec
>+++ b/systemd.spec
>@@ -16,7 +16,7 @@
> Name:           systemd
> Url:            http://www.freedesktop.org/wiki/Software/systemd
> Version:        208
>-Release:        21%{?gitcommit:.git%{gitcommit}}%{?dist}
>+Release:        22%{?gitcommit:.git%{gitcommit}}%{?dist}
> # For a breakdown of the licensing, see README
> License:        LGPLv2+ and MIT and GPLv2+
> Summary:        A System and Service Manager
>@@ -560,6 +560,7 @@ Patch518:       0518-build-sys-don-t-move-libgudev-to-lib.patch
> Patch519:       0519-core-nicer-message-when-inotify-watches-are-exhauste.patch
> Patch520:       0520-journal-reduce-test-journal-send-timeout-from-10s-to.patch
> Patch521:       0521-socket-add-SocketUser-and-SocketGroup-for-chown-ing-.patch
>+Patch522:       0522-nspawn-allow-EEXIST-on-mkdir_safe_label.patch
> 
> 
> # kernel-install patch for grubby, drop if grubby is obsolete
>@@ -1209,6 +1210,9 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g
> %{_datadir}/systemd/gatewayd
> 
> %changelog
>+* Mon Sep 22 2014 Jan Synacek <jsynacek@redhat.com> - 208-22
>+- Fix systemd-nspawn with -u (#1145108)
>+
> * Thu Jul 24 2014 Michal Schmidt <mschmidt@redhat.com> - 208-21
> - Create temporary files after installation (#1084052, fix from #1101983)
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1145108: 940294