wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-02 14:02:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

Reclassify module as BOOTSTRAP only, including minor refactor

Browse Source 
The module setting is deprecated, other mechanisms exist.  This change
is to ensure we don't try to (re)load any modules at runtime, only at
bootstrap.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2021-02-28 09:24:04 +01:00
parent 270512bc97
commit f8c07e81ff
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf.c
+13 -12
View File
@@ -419,8 +419,8 @@ error:
static void parse_static(char *line, int is_rcsd)
{
char *x;
char cmd[CMD_SIZE];
char *x;
if (BOOTSTRAP && (MATCH_CMD(line, "host ", x) || MATCH_CMD(line, "hostname ", x))) {
if (hostname) free(hostname);
@@ -434,7 +434,12 @@ static void parse_static(char *line, int is_rcsd)
strcpy(cmd, "mknod ");
strlcat(cmd, dev, sizeof(cmd));
run_interactive(cmd, "Creating device node %s", dev);
return;
}
/* Kernel module to load */
if (BOOTSTRAP && MATCH_CMD(line, "module ", x)) {
kmod_load(x);
return;
}
@@ -511,16 +516,6 @@ static void parse_dynamic(char *line, struct rlimit rlimit[], char *file)
{
char *x;
/* Skip comments, i.e. lines beginning with # */
if (MATCH_CMD(line, "#", x))
return;
/* Kernel module to load at bootstrap */
if (MATCH_CMD(line, "module ", x)) {
kmod_load(x);
return;
}
/* Monitored daemon, will be respawned on exit */
if (MATCH_CMD(line, "service ", x)) {
service_register(SVC_TYPE_SERVICE, x, rlimit, file);
@@ -585,12 +580,18 @@ static int parse_conf(char *file, int is_rcsd)
_d("*** Parsing %s", file);
while (!feof(fp)) {
char *x;
if (!fgets(line, sizeof(line), fp))
continue;
chomp(line);
tabstospaces(line);
// _d("%s", line);
//DEV _d("%s", line);
/* Skip comments, i.e. lines beginning with # */
if (MATCH_CMD(line, "#", x))
continue;
parse_static(line, is_rcsd);
parse_dynamic(line, is_rcsd ? rlimit : global_rlimit, file);