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

diff --git a/src/unit.c b/src/unit.c
index 32071f217..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;
 
@@ -2152,7 +2155,7 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
                 return 0;
 
         for (;;) {
-                char line[1024], *l, *v;
+                char line[LINE_MAX], *l, *v;
                 size_t k;
 
                 if (!fgets(line, sizeof(line), f)) {