systemd/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch

23 lines
920 B
Diff
Raw Normal View History

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