31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
|
From 0b37b2b7a3fe8e8f96f368848ff46db325a59e70 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Tero Roponen <tero.roponen@gmail.com>
|
||
|
|
Date: Tue, 25 Feb 2014 17:19:35 +0200
|
||
|
|
Subject: [PATCH] nspawn: fix detection of missing /proc/self/loginuid
|
||
|
|
|
||
|
|
Running 'systemd-nspawn -D /srv/Fedora/' gave me this error:
|
||
|
|
Failed to read /proc/self/loginuid: No such file or directory
|
||
|
|
|
||
|
|
Container Fedora failed with error code 1.
|
||
|
|
|
||
|
|
This patch fixes the problem.
|
||
|
|
|
||
|
|
(cherry picked from commit 13e8ceb84e56907d73b6b07418deb37faaf0e66d)
|
||
|
|
---
|
||
|
|
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 de74a43..84b7276 100644
|
||
|
|
--- a/src/nspawn/nspawn.c
|
||
|
|
+++ b/src/nspawn/nspawn.c
|
||
|
|
@@ -1341,7 +1341,7 @@ static int reset_audit_loginuid(void) {
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
r = read_one_line_file("/proc/self/loginuid", &p);
|
||
|
|
- if (r == -EEXIST)
|
||
|
|
+ if (r == -ENOENT)
|
||
|
|
return 0;
|
||
|
|
if (r < 0) {
|
||
|
|
log_error("Failed to read /proc/self/loginuid: %s", strerror(-r));
|