summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-06-29 01:47:55 +0200
committerLennart Poettering <lennart@poettering.net>2011-06-29 01:47:55 +0200
commit193197e85ccc5622abd9653dcd939712334d3ea3 (patch)
tree369f6a532af4c54ed653faf036a2e010c6c703b5
parent932e3ee76ea0a9d28902f694ad1873e37532da35 (diff)
logind: parse configuration file
-rw-r--r--Makefile.am4
-rw-r--r--src/logind-dbus.c1
-rw-r--r--src/logind-session.c13
-rw-r--r--src/logind-user.c4
-rw-r--r--src/logind.c51
-rw-r--r--src/logind.h2
6 files changed, 73 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 3d6951acdc..c288ad4c29 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,7 +197,9 @@ pamlib_LTLIBRARIES = \
endif
dist_pkgsysconf_DATA = \
- src/system.conf
+ src/system.conf \
+ src/user.conf \
+ src/systemd-logind.conf
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf \
diff --git a/src/logind-dbus.c b/src/logind-dbus.c
index ff500f3c6b..69e6b189aa 100644
--- a/src/logind-dbus.c
+++ b/src/logind-dbus.c
@@ -641,6 +641,7 @@ static DBusHandlerResult manager_message_handler(
const BusProperty properties[] = {
{ "org.freedesktop.login1.Manager", "ControlGroupHierarchy", bus_property_append_string, "s", m->cgroup_path },
{ "org.freedesktop.login1.Manager", "Controllers", bus_property_append_strv, "as", m->controllers },
+ { "org.freedesktop.login1.Manager", "ResetControllers", bus_property_append_strv, "as", m->reset_controllers },
{ "org.freedesktop.login1.Manager", "NAutoVTs", bus_property_append_unsigned, "u", &m->n_autovts },
{ "org.freedesktop.login1.Manager", "KillOnlyUsers", bus_property_append_strv, "as", m->kill_only_users },
{ "org.freedesktop.login1.Manager", "KillExcludeUsers", bus_property_append_strv, "as", m->kill_exclude_users },
diff --git a/src/logind-session.c b/src/logind-session.c
index 7671850003..088e956bfc 100644
--- a/src/logind-session.c
+++ b/src/logind-session.c
@@ -473,6 +473,7 @@ static int session_create_cgroup(Session *s) {
STRV_FOREACH(k, s->manager->controllers) {
if (strv_contains(s->reset_controllers, *k) ||
+ strv_contains(s->manager->reset_controllers, *k) ||
strv_contains(s->controllers, *k))
continue;
@@ -489,6 +490,18 @@ static int session_create_cgroup(Session *s) {
log_warning("Failed to reset controller %s: %s", *k, strerror(-r));
}
+
+ STRV_FOREACH(k, s->manager->reset_controllers) {
+
+ if (strv_contains(s->reset_controllers, *k) ||
+ strv_contains(s->controllers, *k))
+ continue;
+
+ r = cg_attach(*k, "/", s->leader);
+ if (r < 0)
+ log_warning("Failed to reset controller %s: %s", *k, strerror(-r));
+
+ }
}
hashmap_put(s->manager->cgroups, s->cgroup_path, s);
diff --git a/src/logind-user.c b/src/logind-user.c
index 4335bf6462..3076ed1573 100644
--- a/src/logind-user.c
+++ b/src/logind-user.c
@@ -246,6 +246,10 @@ static int user_create_cgroup(User *u) {
u->cgroup_path = p;
STRV_FOREACH(k, u->manager->controllers) {
+
+ if (strv_contains(u->manager->reset_controllers, *k))
+ continue;
+
r = cg_create(*k, p);
if (r < 0)
log_warning("Failed to create cgroup %s:%s: %s", *k, p, strerror(-r));
diff --git a/src/logind.c b/src/logind.c
index d38d7d51c3..fd17d80541 100644
--- a/src/logind.c
+++ b/src/logind.c
@@ -32,6 +32,8 @@
#include "logind.h"
#include "dbus-common.h"
#include "dbus-loop.h"
+#include "strv.h"
+#include "conf-parser.h"
Manager *manager_new(void) {
Manager *m;
@@ -124,6 +126,11 @@ void manager_free(Manager *m) {
if (m->epoll_fd >= 0)
close_nointr_nofail(m->epoll_fd);
+ strv_free(m->controllers);
+ strv_free(m->reset_controllers);
+ strv_free(m->kill_only_users);
+ strv_free(m->kill_exclude_users);
+
free(m->cgroup_path);
free(m);
}
@@ -1144,6 +1151,48 @@ int manager_run(Manager *m) {
return 0;
}
+static int manager_parse_config_file(Manager *m) {
+
+ const ConfigItem items[] = {
+ { "NAutoVTs", config_parse_unsigned, 0, &m->n_autovts, "Login" },
+ { "KillUserProcesses", config_parse_bool, 0, &m->kill_user_processes, "Login" },
+ { "KilOnlyUsers", config_parse_strv, 0, &m->kill_only_users, "Login" },
+ { "KillExcludeUsers", config_parse_strv, 0, &m->kill_exclude_users, "Login" },
+ { "Controllers", config_parse_strv, 0, &m->controllers, "Login" },
+ { "ResetControllers", config_parse_strv, 0, &m->reset_controllers, "Login" },
+ { NULL, NULL, 0, NULL, NULL }
+ };
+
+ static const char * const sections[] = {
+ "Login",
+ NULL
+ };
+
+ FILE *f;
+ const char *fn;
+ int r;
+
+ assert(m);
+
+ fn = "/etc/systemd/systemd-logind.conf";
+ f = fopen(fn, "re");
+ if (!f) {
+ if (errno == ENOENT)
+ return 0;
+
+ log_warning("Failed to open configuration file %s: %m", fn);
+ return -errno;
+ }
+
+ r = config_parse(fn, f, sections, items, false, NULL);
+ if (r < 0)
+ log_warning("Failed to parse configuration file: %s", strerror(-r));
+
+ fclose(f);
+
+ return r;
+}
+
int main(int argc, char *argv[]) {
Manager *m = NULL;
int r;
@@ -1167,6 +1216,8 @@ int main(int argc, char *argv[]) {
goto finish;
}
+ manager_parse_config_file(m);
+
r = manager_startup(m);
if (r < 0) {
log_error("Failed to fully start up daemon: %s", strerror(-r));
diff --git a/src/logind.h b/src/logind.h
index 9b9f38bb80..97cfc90ebd 100644
--- a/src/logind.h
+++ b/src/logind.h
@@ -84,7 +84,7 @@ struct Manager {
Seat *vtconsole;
char *cgroup_path;
- char **controllers;
+ char **controllers, **reset_controllers;
char **kill_only_users, **kill_exclude_users;