From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 13 Nov 2015 17:46:50 +0000 (+0100)
Subject: core: enable transient unit support for slice units
X-Git-Tag: v228~16^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17f62e9bd00f5fefd486475861b06d3ec6b7ee10;p=platform%2Fupstream%2Fsystemd.git

core: enable transient unit support for slice units
---

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 72ad612..67e4e8b 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -655,7 +655,18 @@ static int transient_unit_from_message(
         if (r < 0)
                 return r;
 
-        if (u->load_state != UNIT_NOT_FOUND ||
+        /* Check if the unit already exists or is already referenced,
+         * in a number of different ways. Note that to cater for unit
+         * types such as slice, we are generally fine with units that
+         * are marked UNIT_LOADED even even though nothing was
+         * actually loaded, as those unit types don't require a file
+         * on disk to validly load. */
+
+        if (!IN_SET(u->load_state, UNIT_NOT_FOUND, UNIT_LOADED) ||
+            u->fragment_path ||
+            u->source_path ||
+            !strv_isempty(u->dropin_paths) ||
+            u->refs ||
             set_size(u->dependencies[UNIT_REFERENCED_BY]) > 0)
                 return sd_bus_error_setf(error, BUS_ERROR_UNIT_EXISTS, "Unit %s already exists.", name);
 
diff --git a/src/core/slice.c b/src/core/slice.c
index 39dabae..9c488f0 100644
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -305,6 +305,7 @@ const UnitVTable slice_vtable = {
 
         .no_alias = true,
         .no_instances = true,
+        .can_transient = true,
 
         .load = slice_load,