summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-29 10:28:01 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-11-29 11:10:51 -0500
commit820d3acfe924e58965d14b4711d5df31c5db199a (patch)
tree11ed7d9a4a69e3bd731d4459ce0d6feeed239a3a /src/nspawn
parent56e73b34ce0b020ef54c0dc2aba16e50d4fea9f5 (diff)
delta: diff returns 1 when files differ, ignore this
https://bugs.debian/org/771397
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 25f835c230..b6fa8fcc15 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2544,7 +2544,7 @@ static int change_uid_gid(char **_home) {
truncate_nl(line);
- wait_for_terminate_and_warn("getent passwd", pid);
+ wait_for_terminate_and_warn("getent passwd", pid, true);
x = strchr(line, ':');
if (!x) {
@@ -2628,7 +2628,7 @@ static int change_uid_gid(char **_home) {
truncate_nl(line);
- wait_for_terminate_and_warn("getent initgroups", pid);
+ wait_for_terminate_and_warn("getent initgroups", pid, true);
/* Skip over the username and subsequent separator whitespace */
x = line;