daandemeyer / rpms / systemd

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