console: rework automatic getty on kernel console logic again

[elogind.git] / src / manager.c

diff --git a/src/manager.c b/src/manager.c
index 09b2c789ed0c5de538f35ef07cd46a9fa61d366d..0afc99243e29a3bbf1774b20f2bdade6ba011fb0 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -112,6 +112,8 @@ static int manager_setup_notify(Manager *m) {
         if (!(m->notify_socket = strdup(sa.un.sun_path+1)))
                 return -ENOMEM;
 
         if (!(m->notify_socket = strdup(sa.un.sun_path+1)))
                 return -ENOMEM;
 

+        log_debug("Using notification socket %s", m->notify_socket);
+

         return 0;
 }
 
         return 0;
 }
 


@@ -447,6 +449,7 @@ void manager_free(Manager *m) {
 #endif
 
         free(m->notify_socket);
 #endif
 
         free(m->notify_socket);

+        free(m->console);

 
         lookup_paths_free(&m->lookup_paths);
         strv_free(m->environment);
 
         lookup_paths_free(&m->lookup_paths);
         strv_free(m->environment);


@@ -2553,6 +2556,22 @@ void manager_reset_maintenance(Manager *m) {
                 unit_reset_maintenance(u);
 }
 
                 unit_reset_maintenance(u);
 }
 

+int manager_set_console(Manager *m, const char *console) {
+        char *c;
+
+        assert(m);
+
+        if (!(c = strdup(console)))
+                return -ENOMEM;
+
+        free(m->console);
+        m->console = c;
+
+        log_debug("Using kernel console %s", c);
+
+        return 0;
+}
+

 static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = {
         [MANAGER_SYSTEM] = "system",
         [MANAGER_SESSION] = "session"
 static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = {
         [MANAGER_SYSTEM] = "system",
         [MANAGER_SESSION] = "session"