[systemd-commits] 2 commits - cgroup.c Makefile.am manager.c unit.c

[Lennart Poettering]

 Makefile.am |    5 +++++
 cgroup.c    |   12 ++++++------
 manager.c   |   10 +++++-----
 unit.c      |    2 +-
 4 files changed, 17 insertions(+), 12 deletions(-)

New commits:
commit 30de7d8520d1dfaa8c46098f972f57961fc91923
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri May 14 02:50:32 2010 +0200

    downgrade a few log msgs

diff --git a/cgroup.c b/cgroup.c
index 70b56a3..301fc94 100644
--- a/cgroup.c
+++ b/cgroup.c
@@ -456,22 +456,22 @@ int manager_setup_cgroup(Manager *m) {
                 }
         }
 
-        log_info("Using cgroup controller <%s>, hierarchy mounted at <%s>, using root group <%s>.",
-                 m->cgroup_controller,
-                 mp,
-                 m->cgroup_hierarchy);
+        log_debug("Using cgroup controller <%s>, hierarchy mounted at <%s>, using root group <%s>.",
+                  m->cgroup_controller,
+                  mp,
+                  m->cgroup_hierarchy);
 
         if ((r = install_release_agent(m, mp)) < 0)
                 log_warning("Failed to install release agent, ignoring: %s", strerror(-r));
         else
-                log_info("Installed release agent, or already installed.");
+                log_debug("Installed release agent, or already installed.");
 
         free(mp);
 
         if ((r = create_hierarchy_cgroup(m)) < 0)
                 log_error("Failed to create root cgroup hierarchy: %s", strerror(-r));
         else
-                log_info("Created root group.");
+                log_debug("Created root group.");
 
         return r;
 }
diff --git a/unit.c b/unit.c
index 60d4bb7..fd6723f 100644
--- a/unit.c
+++ b/unit.c
@@ -713,7 +713,7 @@ fail:
         u->meta.load_state = UNIT_FAILED;
         unit_add_to_dbus_queue(u);
 
-        log_error("Failed to load configuration for %s: %s", u->meta.id, strerror(-r));
+        log_debug("Failed to load configuration for %s: %s", u->meta.id, strerror(-r));
 
         return r;
 }
commit 4697132b91989da27b11af179c430305bb9db9ac
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri May 14 02:50:19 2010 +0200

    manager: merge /etc/xdg/systemd/session and /etc/systemd/session

diff --git a/Makefile.am b/Makefile.am
index 87c686b..26a2c95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -250,3 +250,8 @@ CLEANFILES = \
 	systemadm.c \
 	systemd-initctl.service \
 	systemd-logger.service
+
+install-data-hook:
+	$(MKDIR_P) $(DESTDIR)$(pkgsysconfdir)/system $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd
+	rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+	ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session
diff --git a/manager.c b/manager.c
index 46b1876..88dc64b 100644
--- a/manager.c
+++ b/manager.c
@@ -149,12 +149,12 @@ static char** session_dirs(void) {
         }
 
         if ((e = getenv("XDG_CONFIG_DIRS")))
-                config_dirs = strv_split(e, ":");
-        else
-                config_dirs = strv_new("/etc/xdg", NULL);
+                if (!(config_dirs = strv_split(e, ":")))
+                        goto fail;
 
-        if (!config_dirs)
-                goto fail;
+        /* We don't treat /etc/xdg/systemd here as the spec
+         * suggests because we assume that that is a link to
+         * /etc/systemd/ anyway. */
 
         if ((e = getenv("XDG_DATA_HOME"))) {
                 if (asprintf(&data_home, "%s/systemd/session", e) < 0)