valeriyvdovin / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0080-nspawn-only-pass-in-slice-setting-if-it-is-set.patch

65878a
From d5e2897030849371bc976ecb8de3ca2fbf16b6bb Mon Sep 17 00:00:00 2001
65878a
From: Lennart Poettering <lennart@poettering.net>
65878a
Date: Wed, 30 Oct 2013 18:40:21 +0100
65878a
Subject: [PATCH] nspawn: only pass in slice setting if it is set
65878a
65878a
---
65878a
 src/nspawn/nspawn.c | 2 +-
65878a
 1 file changed, 1 insertion(+), 1 deletion(-)
65878a
65878a
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
65878a
index eb9605c..9616dbf 100644
65878a
--- a/src/nspawn/nspawn.c
65878a
+++ b/src/nspawn/nspawn.c
65878a
@@ -1202,7 +1202,7 @@ static int register_machine(void) {
65878a
                         "container",
65878a
                         (uint32_t) 0,
65878a
                         strempty(arg_directory),
65878a
-                        1, "Slice", "s", strempty(arg_slice));
65878a
+                        !isempty(arg_slice), "Slice", "s", arg_slice);
65878a
         if (r < 0) {
65878a
                 log_error("Failed to register machine: %s", error.message ? error.message : strerror(-r));
65878a
                 return r;