X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=load-fragment.c;h=9eb00531c94e27d217c5b594e363151e9733d06f;hb=80876c20f64f87765242bc35895977ab6a855729;hp=c0972d04fb6010a6f803933f6197bea2188dcf91;hpb=23a177ef7c8c38c238ef06666f900f581b48298f;p=elogind.git diff --git a/load-fragment.c b/load-fragment.c index c0972d04f..9eb00531c 100644 --- a/load-fragment.c +++ b/load-fragment.c @@ -56,6 +56,15 @@ static int config_parse_deps( assert(lvalue); assert(rvalue); + if (UNIT_VTABLE(u)->refuse_requires && + (d == UNIT_REQUIRES || + d == UNIT_SOFT_REQUIRES || + d == UNIT_REQUISITE || + d == UNIT_SOFT_REQUISITE)) { + log_error("[%s:%u] Dependency of type %s not acceptable for this unit type.", filename, line, lvalue); + return -EBADMSG; + } + FOREACH_WORD(w, l, rvalue, state) { char *t; int r; @@ -979,6 +988,32 @@ static int config_parse_sysv_priority( return 0; } +static int config_parse_kill_mode( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + KillMode *m = data, x; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + if ((x = kill_mode_from_string(rvalue)) < 0) { + log_error("[%s:%u] Failed to parse kill mode specifier: %s", filename, line, rvalue); + return -EBADMSG; + } + + *m = x; + + return 0; +} + #define FOLLOW_MAX 8 static int open_follow(char **filename, FILE **_f, Set *names, char **_id) { @@ -1090,7 +1125,80 @@ static int merge_by_names(Unit **u, Set *names, const char *id) { return 0; } -static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { +static void dump_items(FILE *f, const ConfigItem *items) { + const ConfigItem *i; + const char *prev_section = NULL; + bool not_first = false; + + struct { + ConfigParserCallback callback; + const char *rvalue; + } table[] = { + { config_parse_int, "INTEGER" }, + { config_parse_unsigned, "UNSIGNED" }, + { config_parse_size, "SIZE" }, + { config_parse_bool, "BOOLEAN" }, + { config_parse_string, "STRING" }, + { config_parse_path, "PATH" }, + { config_parse_strv, "STRING [...]" }, + { config_parse_nice, "NICE" }, + { config_parse_oom_adjust, "OOMADJUST" }, + { config_parse_io_class, "IOCLASS" }, + { config_parse_io_priority, "IOPRIORITY" }, + { config_parse_cpu_sched_policy, "CPUSCHEDPOLICY" }, + { config_parse_cpu_sched_prio, "CPUSCHEDPRIO" }, + { config_parse_cpu_affinity, "CPUAFFINITY" }, + { config_parse_mode, "MODE" }, + { config_parse_output, "OUTPUT" }, + { config_parse_input, "INPUT" }, + { config_parse_facility, "FACILITY" }, + { config_parse_level, "LEVEL" }, + { config_parse_capabilities, "CAPABILITIES" }, + { config_parse_secure_bits, "SECUREBITS" }, + { config_parse_bounding_set, "BOUNDINGSET" }, + { config_parse_timer_slack_ns, "TIMERSLACK" }, + { config_parse_limit, "LIMIT" }, + { config_parse_cgroup, "CGROUP [...]" }, + { config_parse_deps, "UNIT [...]" }, + { config_parse_names, "UNIT [...]" }, + { config_parse_exec, "PATH [ARGUMENT [...]]" }, + { config_parse_service_type, "SERVICETYPE" }, + { config_parse_service_restart, "SERVICERESTART" }, + { config_parse_sysv_priority, "SYSVPRIORITY" }, + { config_parse_kill_mode, "KILLMODE" }, + { config_parse_listen, "SOCKET [...]" }, + { config_parse_socket_bind, "SOCKETBIND" }, + { config_parse_bindtodevice, "NETWORKINTERFACE" } + }; + + assert(f); + assert(items); + + for (i = items; i->lvalue; i++) { + unsigned j; + const char *rvalue = "OTHER"; + + if (!streq_ptr(i->section, prev_section)) { + if (!not_first) + not_first = true; + else + fputc('\n', f); + + fprintf(f, "[%s]\n", i->section); + prev_section = i->section; + } + + for (j = 0; j < ELEMENTSOF(table); j++) + if (i->parse == table[j].callback) { + rvalue = table[j].rvalue; + break; + } + + fprintf(f, "%s=%s\n", i->lvalue, rvalue); + } +} + +static int load_from_path(Unit *u, const char *path) { static const char* const section_table[_UNIT_TYPE_MAX] = { [UNIT_SERVICE] = "Service", @@ -1119,8 +1227,10 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "CPUAffinity", config_parse_cpu_affinity, &(context), section }, \ { "UMask", config_parse_mode, &(context).umask, section }, \ { "Environment", config_parse_strv, &(context).environment, section }, \ - { "Output", config_parse_output, &(context).output, section }, \ - { "Input", config_parse_input, &(context).input, section }, \ + { "StandardInput", config_parse_input, &(context).std_input, section }, \ + { "StandardOutput", config_parse_output, &(context).std_output, section }, \ + { "StandardError", config_parse_output, &(context).std_output, section }, \ + { "TTYPath", config_parse_path, &(context).tty_path, section }, \ { "SyslogIdentifier", config_parse_string, &(context).syslog_identifier, section }, \ { "SyslogFacility", config_parse_facility, &(context).syslog_priority, section }, \ { "SyslogLevel", config_parse_level, &(context).syslog_priority, section }, \ @@ -1144,8 +1254,7 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "LimitNICE", config_parse_limit, &(context).rlimit[RLIMIT_NICE], section }, \ { "LimitRTPRIO", config_parse_limit, &(context).rlimit[RLIMIT_RTPRIO], section }, \ { "LimitRTTIME", config_parse_limit, &(context).rlimit[RLIMIT_RTTIME], section }, \ - { "NonBlocking", config_parse_bool, &(context).non_blocking, section }, \ - { "ControlGroup", config_parse_cgroup, u, section } \ + { "ControlGroup", config_parse_cgroup, u, section } const ConfigItem items[] = { { "Names", config_parse_names, u, "Meta" }, @@ -1176,6 +1285,8 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "RootDirectoryStartOnly", config_parse_bool, &u->service.root_directory_start_only, "Service" }, { "ValidNoProcess", config_parse_bool, &u->service.valid_no_process, "Service" }, { "SysVStartPriority", config_parse_sysv_priority, &u->service.sysv_start_priority, "Service" }, + { "KillMode", config_parse_kill_mode, &u->service.kill_mode, "Service" }, + { "NonBlocking", config_parse_bool, &u->service.exec_context.non_blocking, "Service" }, EXEC_CONTEXT_CONFIG_ITEMS(u->service.exec_context, "Service"), { "ListenStream", config_parse_listen, &u->socket, "Socket" }, @@ -1189,11 +1300,19 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { { "ExecStartPost", config_parse_exec, u->socket.exec_command+SOCKET_EXEC_START_POST, "Socket" }, { "ExecStopPre", config_parse_exec, u->socket.exec_command+SOCKET_EXEC_STOP_PRE, "Socket" }, { "ExecStopPost", config_parse_exec, u->socket.exec_command+SOCKET_EXEC_STOP_POST, "Socket" }, + { "TimeoutSec", config_parse_usec, &u->socket.timeout_usec, "Socket" }, { "DirectoryMode", config_parse_mode, &u->socket.directory_mode, "Socket" }, { "SocketMode", config_parse_mode, &u->socket.socket_mode, "Socket" }, + { "KillMode", config_parse_kill_mode, &u->socket.kill_mode, "Socket" }, EXEC_CONTEXT_CONFIG_ITEMS(u->socket.exec_context, "Socket"), - EXEC_CONTEXT_CONFIG_ITEMS(u->automount.exec_context, "Automount"), + { "What", config_parse_string, &u->mount.parameters_fragment.what, "Mount" }, + { "Where", config_parse_path, &u->mount.where, "Mount" }, + { "Options", config_parse_string, &u->mount.parameters_fragment.options, "Mount" }, + { "Type", config_parse_string, &u->mount.parameters_fragment.fstype, "Mount" }, + { "TimeoutSec", config_parse_usec, &u->mount.timeout_usec, "Mount" }, + { "KillMode", config_parse_kill_mode, &u->mount.kill_mode, "Mount" }, + EXEC_CONTEXT_CONFIG_ITEMS(u->mount.exec_context, "Mount"), { NULL, NULL, NULL, NULL } }; @@ -1208,8 +1327,14 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { char *filename = NULL, *id = NULL; Unit *merged; + if (!u) { + /* Dirty dirty hack. */ + dump_items((FILE*) path, items); + return 0; + } + assert(u); - assert(new_state); + assert(path); sections[0] = "Meta"; sections[1] = section_table[u->meta.type]; @@ -1276,7 +1401,7 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { goto finish; if (merged != u) { - *new_state = UNIT_MERGED; + u->meta.load_state = UNIT_MERGED; r = 0; goto finish; } @@ -1289,7 +1414,7 @@ static int load_from_path(Unit *u, const char *path, UnitLoadState *new_state) { u->meta.fragment_path = filename; filename = NULL; - *new_state = UNIT_LOADED; + u->meta.load_state = UNIT_LOADED; r = 0; finish: @@ -1305,16 +1430,14 @@ finish: return r; } -int unit_load_fragment(Unit *u, UnitLoadState *new_state) { +int unit_load_fragment(Unit *u) { int r; assert(u); - assert(new_state); - assert(*new_state == UNIT_STUB); if (u->meta.fragment_path) { - if ((r = load_from_path(u, u->meta.fragment_path, new_state)) < 0) + if ((r = load_from_path(u, u->meta.fragment_path)) < 0) return r; } else { @@ -1323,23 +1446,29 @@ int unit_load_fragment(Unit *u, UnitLoadState *new_state) { /* Try to find the unit under its id */ if ((t = unit_id(u))) - if ((r = load_from_path(u, t, new_state)) < 0) + if ((r = load_from_path(u, t)) < 0) return r; /* Try to find an alias we can load this with */ - if (*new_state == UNIT_STUB) + if (u->meta.load_state == UNIT_STUB) SET_FOREACH(t, u->meta.names, i) { if (unit_id(u) == t) continue; - if ((r = load_from_path(u, t, new_state)) < 0) + if ((r = load_from_path(u, t)) < 0) return r; - if (*new_state != UNIT_STUB) + if (u->meta.load_state != UNIT_STUB) break; } } return 0; } + +void unit_dump_config_items(FILE *f) { + /* OK, this wins a prize for extreme ugliness. */ + + load_from_path(NULL, (const void*) f); +}