X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Funit.c;h=f50477f878a47dd31ffb8eeb88473a5a18107b82;hp=37a7c07ae8f0eb75b5ca2b57c9052fb450f84d0e;hb=df18d8c8959bbd9d7b866c6946aa856e462a06b3;hpb=20c03b7be2c87ef54533db849fd046d7014c36b4

diff --git a/src/unit.c b/src/unit.c
index 37a7c07ae..f50477f87 100644
--- a/src/unit.c
+++ b/src/unit.c
@@ -664,7 +664,7 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
                         "%s\tRefuseManualStart: %s\n"
                         "%s\tRefuseManualStop: %s\n"
                         "%s\tDefaultDependencies: %s\n"
-                        "%s\rOnFailureIsolate: %s\n",
+                        "%s\tOnFailureIsolate: %s\n",
                         prefix, yes_no(u->meta.stop_when_unneeded),
                         prefix, yes_no(u->meta.refuse_manual_start),
                         prefix, yes_no(u->meta.refuse_manual_stop),
@@ -1876,6 +1876,9 @@ int unit_add_default_cgroups(Unit *u) {
         /* Adds in the default cgroups, if they weren't specified
          * otherwise. */
 
+        if (!u->meta.manager->cgroup_hierarchy)
+                return 0;
+
         if ((r = unit_add_one_default_cgroup(u, NULL)) < 0)
                 return r;