mirror of
https://github.com/troglobit/finit.git
synced 2026-11-21 19:51:46 +00:00
15 files changed
+402
-534
No files matched your search
+4
-4
@@ -19,9 +19,6 @@ Some of these are also registered in the issue tracker on GitHub.
|
|||||||
* Add new (complimentary) .svc file format to slowly migrate away
|
* Add new (complimentary) .svc file format to slowly migrate away
|
||||||
from the very terse one-liner format currently used
|
from the very terse one-liner format currently used
|
||||||
* Allow running as non-pid1 => read .conf and RCSD form cmdline
|
* Allow running as non-pid1 => read .conf and RCSD form cmdline
|
||||||
* When a process dies, and Finit does not restart it, we should collect
|
|
||||||
a `siginfo_t` from the SIGCHLD signal and supply to the user in case
|
|
||||||
`initctl status <process>` is called to debug the issue.
|
|
||||||
* Add `finit.conf` support for UPS notification (SIGPWR) to start a task
|
* Add `finit.conf` support for UPS notification (SIGPWR) to start a task
|
||||||
using, e.g. <sys/power/{ok,fail,low}> conditions. More info in sig.c
|
using, e.g. <sys/power/{ok,fail,low}> conditions. More info in sig.c
|
||||||
* Add `finit.conf` support for ctrl-alt-delete (SIGINT) and kbrequest,
|
* Add `finit.conf` support for ctrl-alt-delete (SIGINT) and kbrequest,
|
||||||
@@ -29,7 +26,10 @@ Some of these are also registered in the issue tracker on GitHub.
|
|||||||
e.g, <sys/key/ctrlaltdel> and <sys/key/signal> like SIGPWR handling.
|
e.g, <sys/key/ctrlaltdel> and <sys/key/signal> like SIGPWR handling.
|
||||||
* Write man pages for finit and `finit.conf`, steal from the excellent
|
* Write man pages for finit and `finit.conf`, steal from the excellent
|
||||||
`pimd` man pages ...
|
`pimd` man pages ...
|
||||||
* Add support for timed shutdown in Finit, including cancelled shutdown
|
* Add support for timed shutdown in Finit, including cancelled shutdown:
|
||||||
|
|
||||||
|
shutdown -h 03:35 "foobar was here"
|
||||||
|
|
||||||
* Add support for JSON output, or similar, from `initctl show`, e.g.
|
* Add support for JSON output, or similar, from `initctl show`, e.g.
|
||||||
`initctl show --json`
|
`initctl show --json`
|
||||||
|
|
||||||
|
|||||||
+16
-10
@@ -32,13 +32,14 @@
|
|||||||
#include "finit.h"
|
#include "finit.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
#include "plugin.h"
|
#include "plugin.h"
|
||||||
|
#include "service.h"
|
||||||
#include "tty.h"
|
#include "tty.h"
|
||||||
|
|
||||||
static void watcher(void *arg, int fd, int events);
|
static void tty_watcher(void *arg, int fd, int events);
|
||||||
|
|
||||||
static plugin_t plugin = {
|
static plugin_t plugin = {
|
||||||
.io = {
|
.io = {
|
||||||
.cb = watcher,
|
.cb = tty_watcher,
|
||||||
.flags = PLUGIN_IO_READ,
|
.flags = PLUGIN_IO_READ,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -56,19 +57,24 @@ static void setup(void)
|
|||||||
static void do_tty(char *tty, size_t len, int creat)
|
static void do_tty(char *tty, size_t len, int creat)
|
||||||
{
|
{
|
||||||
char name[len + 6];
|
char name[len + 6];
|
||||||
struct tty *entry;
|
svc_t *svc;
|
||||||
|
|
||||||
snprintf(name, sizeof(name), "/dev/%s", tty);
|
snprintf(name, sizeof(name), "/dev/%s", tty);
|
||||||
entry = tty_find(name);
|
svc = svc_find_by_tty(name);
|
||||||
if (entry && tty_enabled(entry)) {
|
if (svc) {
|
||||||
if (creat)
|
if (svc_is_blocked(svc) && creat) {
|
||||||
tty_start(entry);
|
_d("%s: blocked, re-enabling", svc_ident(svc, NULL, 0));
|
||||||
else if (entry->pid)
|
svc_start(svc);
|
||||||
tty_stop(entry);
|
} else if (svc->pid) {
|
||||||
|
_d("%s: missing ...", svc_ident(svc, NULL, 0));
|
||||||
|
svc_missing(svc);
|
||||||
|
}
|
||||||
|
|
||||||
|
service_step_all(SVC_TYPE_TTY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void watcher(void *arg, int fd, int events)
|
static void tty_watcher(void *arg, int fd, int events)
|
||||||
{
|
{
|
||||||
static char ev_buf[8 *(sizeof(struct inotify_event) + NAME_MAX + 1) + 1];
|
static char ev_buf[8 *(sizeof(struct inotify_event) + NAME_MAX + 1) + 1];
|
||||||
struct inotify_event *ev;
|
struct inotify_event *ev;
|
||||||
|
|||||||
+6
-6
@@ -127,12 +127,12 @@ static int cond_checkpath(const char *path)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int cond_set_path(const char *path, enum cond_state new)
|
int cond_set_path(const char *path, enum cond_state next)
|
||||||
{
|
{
|
||||||
enum cond_state old;
|
enum cond_state prev;
|
||||||
unsigned int rgen;
|
unsigned int rgen;
|
||||||
|
|
||||||
_d("%s", path);
|
_d("%s <= %d", path, next);
|
||||||
|
|
||||||
rgen = cond_get_gen(_PATH_RECONF);
|
rgen = cond_get_gen(_PATH_RECONF);
|
||||||
if (!rgen) {
|
if (!rgen) {
|
||||||
@@ -140,9 +140,9 @@ int cond_set_path(const char *path, enum cond_state new)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
old = cond_get_path(path);
|
prev = cond_get_path(path);
|
||||||
|
|
||||||
switch (new) {
|
switch (next) {
|
||||||
case COND_ON:
|
case COND_ON:
|
||||||
if (cond_checkpath(path))
|
if (cond_checkpath(path))
|
||||||
return 0;
|
return 0;
|
||||||
@@ -159,7 +159,7 @@ int cond_set_path(const char *path, enum cond_state new)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new != old;
|
return next != prev;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Should only be used by cond_set*(), cond_clear(), and usr plugin! */
|
/* Should only be used by cond_set*(), cond_clear(), and usr plugin! */
|
||||||
|
|||||||
+6
-3
@@ -592,7 +592,7 @@ static void parse_dynamic(char *line, struct rlimit rlimit[], char *file)
|
|||||||
|
|
||||||
/* Regular or serial TTYs to run getty */
|
/* Regular or serial TTYs to run getty */
|
||||||
if (MATCH_CMD(line, "tty ", x)) {
|
if (MATCH_CMD(line, "tty ", x)) {
|
||||||
tty_register(strip_line(x), rlimit, file);
|
service_register(SVC_TYPE_TTY, strip_line(x), rlimit, file);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -664,7 +664,6 @@ int conf_reload(void)
|
|||||||
/* Mark and sweep */
|
/* Mark and sweep */
|
||||||
cgroup_mark_all();
|
cgroup_mark_all();
|
||||||
svc_mark_dynamic();
|
svc_mark_dynamic();
|
||||||
tty_mark();
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Reset global rlimit to bootstrap values from conf_init().
|
* Reset global rlimit to bootstrap values from conf_init().
|
||||||
@@ -678,7 +677,7 @@ int conf_reload(void)
|
|||||||
/* If rescue.conf is missing, fall back to a root shell */
|
/* If rescue.conf is missing, fall back to a root shell */
|
||||||
rc = parse_conf(RESCUE_CONF, 0);
|
rc = parse_conf(RESCUE_CONF, 0);
|
||||||
if (rc)
|
if (rc)
|
||||||
tty_register(line, global_rlimit, NULL);
|
service_register(SVC_TYPE_TTY, line, global_rlimit, NULL);
|
||||||
|
|
||||||
print(rc, "Entering rescue mode");
|
print(rc, "Entering rescue mode");
|
||||||
goto done;
|
goto done;
|
||||||
@@ -738,6 +737,10 @@ int conf_reload(void)
|
|||||||
|
|
||||||
globfree(&gl);
|
globfree(&gl);
|
||||||
|
|
||||||
|
/* Verify config, do we have at least one TTY available? */
|
||||||
|
if (tty_fallback(FINIT_CONF))
|
||||||
|
logit(LOG_WARNING, "warning, no getty enabled on local TTYs.");
|
||||||
|
|
||||||
/* Mark any reverse deps as chenaged. */
|
/* Mark any reverse deps as chenaged. */
|
||||||
service_update_rdeps();
|
service_update_rdeps();
|
||||||
|
|
||||||
|
|||||||
+13
-39
@@ -245,10 +245,6 @@ static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit
|
|||||||
char name[80];
|
char name[80];
|
||||||
int fd;
|
int fd;
|
||||||
|
|
||||||
/* Detach from initial controlling TTY and become session leader */
|
|
||||||
vhangup();
|
|
||||||
setsid();
|
|
||||||
|
|
||||||
fd = open(tty, O_RDWR);
|
fd = open(tty, O_RDWR);
|
||||||
if (fd < 0) {
|
if (fd < 0) {
|
||||||
logit(LOG_ERR, "Failed opening %s: %s", tty, strerror(errno));
|
logit(LOG_ERR, "Failed opening %s: %s", tty, strerror(errno));
|
||||||
@@ -260,6 +256,11 @@ static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit
|
|||||||
dup2(fd, STDERR_FILENO);
|
dup2(fd, STDERR_FILENO);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Become session leader and set controlling TTY
|
||||||
|
* to enable Ctrl-C and job control in shell.
|
||||||
|
*/
|
||||||
|
setsid();
|
||||||
if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) < 0)
|
if (ioctl(STDIN_FILENO, TIOCSCTTY, 1) < 0)
|
||||||
logit(LOG_WARNING, "Failed TIOCSCTTY on %s: %s", tty, strerror(errno));
|
logit(LOG_WARNING, "Failed TIOCSCTTY on %s: %s", tty, strerror(errno));
|
||||||
|
|
||||||
@@ -382,15 +383,9 @@ static int activate_console(int noclear, int nowait)
|
|||||||
*/
|
*/
|
||||||
pid_t run_getty(char *tty, char *baud, char *term, int noclear, int nowait, struct rlimit rlimit[])
|
pid_t run_getty(char *tty, char *baud, char *term, int noclear, int nowait, struct rlimit rlimit[])
|
||||||
{
|
{
|
||||||
pid_t pid;
|
|
||||||
|
|
||||||
pid = fork();
|
|
||||||
if (!pid) {
|
|
||||||
speed_t speed;
|
speed_t speed;
|
||||||
int rc = 1;
|
int rc = 1;
|
||||||
|
|
||||||
sched_yield();
|
|
||||||
|
|
||||||
speed = stty_parse_speed(baud);
|
speed = stty_parse_speed(baud);
|
||||||
prepare_tty(tty, speed, "tty", rlimit);
|
prepare_tty(tty, speed, "tty", rlimit);
|
||||||
if (activate_console(noclear, nowait)) {
|
if (activate_console(noclear, nowait)) {
|
||||||
@@ -398,58 +393,37 @@ pid_t run_getty(char *tty, char *baud, char *term, int noclear, int nowait, stru
|
|||||||
rc = getty(tty, speed, term, NULL);
|
rc = getty(tty, speed, term, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
_exit(rc);
|
return rc;
|
||||||
}
|
|
||||||
|
|
||||||
cgroup_user("getty", pid);
|
|
||||||
|
|
||||||
return pid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Start external getty as defined by user in .conf file
|
||||||
|
*/
|
||||||
pid_t run_getty2(char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[])
|
pid_t run_getty2(char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[])
|
||||||
{
|
{
|
||||||
pid_t pid;
|
|
||||||
|
|
||||||
pid = fork();
|
|
||||||
if (!pid) {
|
|
||||||
int rc = 1;
|
int rc = 1;
|
||||||
|
|
||||||
sched_yield();
|
|
||||||
|
|
||||||
/* Dunno speed, tell stty() to not mess with it */
|
/* Dunno speed, tell stty() to not mess with it */
|
||||||
prepare_tty(tty, B0, "getty", rlimit);
|
prepare_tty(tty, B0, "getty", rlimit);
|
||||||
if (activate_console(noclear, nowait)) {
|
if (activate_console(noclear, nowait)) {
|
||||||
logit(LOG_INFO, "Starting external getty on %s, speed %u", tty, B0);
|
logit(LOG_INFO, "Starting external getty on %s", tty);
|
||||||
rc = execv(cmd, args);
|
rc = execv(cmd, args);
|
||||||
}
|
}
|
||||||
|
|
||||||
vhangup();
|
vhangup();
|
||||||
_exit(rc);
|
|
||||||
}
|
|
||||||
|
|
||||||
cgroup_user("getty", pid);
|
return rc;
|
||||||
|
|
||||||
return pid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pid_t run_sh(char *tty, int noclear, int nowait, struct rlimit rlimit[])
|
pid_t run_sh(char *tty, int noclear, int nowait, struct rlimit rlimit[])
|
||||||
{
|
{
|
||||||
pid_t pid;
|
|
||||||
|
|
||||||
pid = fork();
|
|
||||||
if (!pid) {
|
|
||||||
int rc = 1;
|
int rc = 1;
|
||||||
|
|
||||||
prepare_tty(tty, B0, "finit-sh", rlimit);
|
prepare_tty(tty, B0, "finitsh", rlimit);
|
||||||
if (activate_console(noclear, nowait))
|
if (activate_console(noclear, nowait))
|
||||||
rc = sh(tty);
|
rc = sh(tty);
|
||||||
|
|
||||||
_exit(rc);
|
return rc;
|
||||||
}
|
|
||||||
|
|
||||||
cgroup_user("root", pid);
|
|
||||||
|
|
||||||
return pid;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int run_parts(char *dir, char *cmd)
|
int run_parts(char *dir, char *cmd)
|
||||||
|
|||||||
+4
-3
@@ -59,6 +59,7 @@ int prevlevel = -1;
|
|||||||
int debug = 0; /* debug mode from kernel cmdline */
|
int debug = 0; /* debug mode from kernel cmdline */
|
||||||
int rescue = 0; /* rescue mode from kernel cmdline */
|
int rescue = 0; /* rescue mode from kernel cmdline */
|
||||||
int single = 0; /* single user mode from kernel cmdline */
|
int single = 0; /* single user mode from kernel cmdline */
|
||||||
|
int bootstrap = 1; /* set while bootrapping (for TTYs) */
|
||||||
char *sdown = NULL;
|
char *sdown = NULL;
|
||||||
char *network = NULL;
|
char *network = NULL;
|
||||||
char *hostname = NULL;
|
char *hostname = NULL;
|
||||||
@@ -310,9 +311,9 @@ static void finalize(void *unused)
|
|||||||
/* Disable progress output at normal runtime */
|
/* Disable progress output at normal runtime */
|
||||||
enable_progress(0);
|
enable_progress(0);
|
||||||
|
|
||||||
/* Delayed start of TTYs at bootstrap */
|
/* System bootrapped, launch TTYs et al */
|
||||||
_d("Launching all getty services ...");
|
bootstrap = 0;
|
||||||
tty_runlevel();
|
service_step_all(SVC_TYPE_RESPAWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -30,6 +30,7 @@
|
|||||||
#include <paths.h>
|
#include <paths.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <sysexits.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@@ -105,6 +106,7 @@ extern int prevlevel;
|
|||||||
extern int debug;
|
extern int debug;
|
||||||
extern int rescue;
|
extern int rescue;
|
||||||
extern int single;
|
extern int single;
|
||||||
|
extern int bootstrap;
|
||||||
extern char *rcsd;
|
extern char *rcsd;
|
||||||
extern char *sdown;
|
extern char *sdown;
|
||||||
extern char *network;
|
extern char *network;
|
||||||
|
|||||||
+1
-1
@@ -626,7 +626,7 @@ static char *status(svc_t *svc, int full)
|
|||||||
{
|
{
|
||||||
static char buf[64];
|
static char buf[64];
|
||||||
const char *color;
|
const char *color;
|
||||||
char ok[64] = {0};
|
char ok[32] = {0};
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
s = svc_status(svc);
|
s = svc_status(svc);
|
||||||
|
|||||||
+1
-1
@@ -196,7 +196,7 @@ void plugin_run_hook(hook_point_t no, void *arg)
|
|||||||
|
|
||||||
PLUGIN_ITERATOR(p, tmp) {
|
PLUGIN_ITERATOR(p, tmp) {
|
||||||
if (p->hook[no].cb) {
|
if (p->hook[no].cb) {
|
||||||
_d("Calling %s hook n:o %d (arg: %p) ...", basename(p->name), no, arg);
|
_d("Calling %s hook n:o %d (arg: %p) ...", basename(p->name), no, arg ?: "NIL");
|
||||||
p->hook[no].cb(arg ? arg : p->hook[no].arg);
|
p->hook[no].cb(arg ? arg : p->hook[no].arg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+124
-28
@@ -412,6 +412,16 @@ static int service_start(svc_t *svc)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (svc_is_tty(svc)) {
|
||||||
|
char *dev = tty_canonicalize(svc->dev);
|
||||||
|
|
||||||
|
if (!dev || !tty_exists(dev)) {
|
||||||
|
_d("TTY %s missing or invalid, halting service.", svc->dev);
|
||||||
|
svc_missing(svc);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (svc_is_sysv(svc))
|
if (svc_is_sysv(svc))
|
||||||
logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s start' ...", svc->cmd);
|
logit(LOG_CONSOLE | LOG_NOTICE, "Calling '%s start' ...", svc->cmd);
|
||||||
|
|
||||||
@@ -538,6 +548,7 @@ static int service_start(svc_t *svc)
|
|||||||
}
|
}
|
||||||
args[i] = NULL;
|
args[i] = NULL;
|
||||||
|
|
||||||
|
if (!svc_is_tty(svc))
|
||||||
redirect(svc);
|
redirect(svc);
|
||||||
sig_unblock();
|
sig_unblock();
|
||||||
|
|
||||||
@@ -556,6 +567,8 @@ static int service_start(svc_t *svc)
|
|||||||
|
|
||||||
if (svc_is_runtask(svc))
|
if (svc_is_runtask(svc))
|
||||||
status = exec_runtask(args[0], &args[1]);
|
status = exec_runtask(args[0], &args[1]);
|
||||||
|
else if (svc_is_tty(svc))
|
||||||
|
status = tty_exec(svc);
|
||||||
else
|
else
|
||||||
status = execvp(args[0], &args[1]);
|
status = execvp(args[0], &args[1]);
|
||||||
|
|
||||||
@@ -573,6 +586,9 @@ static int service_start(svc_t *svc)
|
|||||||
_d("Starting %s %s", svc->cmd, buf);
|
_d("Starting %s %s", svc->cmd, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (svc_is_tty(svc))
|
||||||
|
cgroup_user("getty", pid);
|
||||||
|
else
|
||||||
cgroup_service(group_name(svc, grnam, sizeof(grnam)), pid, &svc->cgroup);
|
cgroup_service(group_name(svc, grnam, sizeof(grnam)), pid, &svc->cgroup);
|
||||||
|
|
||||||
logit(LOG_CONSOLE | LOG_NOTICE, "Starting %s[%d]", svc_ident(svc, NULL, 0), pid);
|
logit(LOG_CONSOLE | LOG_NOTICE, "Starting %s[%d]", svc_ident(svc, NULL, 0), pid);
|
||||||
@@ -648,7 +664,13 @@ static void service_cleanup(svc_t *svc)
|
|||||||
logit(LOG_CRIT, "Failed removing service %s pidfile %s",
|
logit(LOG_CRIT, "Failed removing service %s pidfile %s",
|
||||||
basename(svc->cmd), fn);
|
basename(svc->cmd), fn);
|
||||||
|
|
||||||
|
/* PID collected, cancel any pending SIGKILL */
|
||||||
|
service_timeout_cancel(svc);
|
||||||
|
|
||||||
/* No longer running, update books. */
|
/* No longer running, update books. */
|
||||||
|
if (svc_is_tty(svc) && svc->pid > 1)
|
||||||
|
utmp_set_dead(svc->pid); /* Set DEAD_PROCESS UTMP entry */
|
||||||
|
|
||||||
svc->oldpid = svc->pid;
|
svc->oldpid = svc->pid;
|
||||||
svc->start_time = svc->pid = 0;
|
svc->start_time = svc->pid = 0;
|
||||||
}
|
}
|
||||||
@@ -693,7 +715,7 @@ static int service_stop(svc_t *svc)
|
|||||||
if (svc->pid > 1) {
|
if (svc->pid > 1) {
|
||||||
/* Kill all children in the same proess group, e.g. logit */
|
/* Kill all children in the same proess group, e.g. logit */
|
||||||
rc = kill(-svc->pid, svc->sighalt);
|
rc = kill(-svc->pid, svc->sighalt);
|
||||||
|
_d("kill(-%d, %d) => rc %d", svc->pid, svc->sighalt, rc);
|
||||||
/* PID lost or forking process never really started */
|
/* PID lost or forking process never really started */
|
||||||
if (rc == -1 && ESRCH == errno)
|
if (rc == -1 && ESRCH == errno)
|
||||||
service_cleanup(svc);
|
service_cleanup(svc);
|
||||||
@@ -925,13 +947,10 @@ static void parse_name(svc_t *svc, char *arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
strlcpy(svc->name, name, sizeof(svc->name));
|
strlcpy(svc->name, name, sizeof(svc->name));
|
||||||
|
|
||||||
/* Warn if svc generates same condition as an existing service */
|
|
||||||
svc_validate(svc);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* parse_cmdline_args - Update the command line args in the svc struct
|
* Update the command line args in the svc struct
|
||||||
*
|
*
|
||||||
* strtok internal pointer must be positioned at first command line arg
|
* strtok internal pointer must be positioned at first command line arg
|
||||||
* when this function is called.
|
* when this function is called.
|
||||||
@@ -953,7 +972,7 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
|
|||||||
* Copy supplied args. Stop at MAX_NUM_SVC_ARGS-1 to allow the args
|
* Copy supplied args. Stop at MAX_NUM_SVC_ARGS-1 to allow the args
|
||||||
* array to be zero-terminated.
|
* array to be zero-terminated.
|
||||||
*/
|
*/
|
||||||
for (i = 1; (arg = strtok(NULL, " ")) && i < (MAX_NUM_SVC_ARGS - 1);) {
|
while ((arg = strtok(NULL, " ")) && i < (MAX_NUM_SVC_ARGS - 1)) {
|
||||||
char prev[sizeof(svc->args[0])] = { 0 };
|
char prev[sizeof(svc->args[0])] = { 0 };
|
||||||
char ch = arg[0];
|
char ch = arg[0];
|
||||||
size_t len;
|
size_t len;
|
||||||
@@ -979,6 +998,10 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* replace any @console arg with the expanded device name */
|
||||||
|
if (svc_is_tty(svc) && tty_isatcon(svc->args[i]))
|
||||||
|
strlcpy(svc->args[i], svc->dev, sizeof(svc->args[i]));
|
||||||
|
|
||||||
if (strcmp(svc->args[i], prev))
|
if (strcmp(svc->args[i], prev))
|
||||||
diff++;
|
diff++;
|
||||||
|
|
||||||
@@ -996,13 +1019,6 @@ static void parse_cmdline_args(svc_t *svc, char *cmd)
|
|||||||
diff++;
|
diff++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if 0
|
|
||||||
for (i = 0; i < MAX_NUM_SVC_ARGS; i++) {
|
|
||||||
if (!svc->args[i][0])
|
|
||||||
break;
|
|
||||||
_d("%s ", svc->args[i]);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (diff)
|
if (diff)
|
||||||
_d("Modified args for %s detected", cmd);
|
_d("Modified args for %s detected", cmd);
|
||||||
@@ -1071,6 +1087,8 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
|
|||||||
char *username = NULL, *log = NULL, *pid = NULL;
|
char *username = NULL, *log = NULL, *pid = NULL;
|
||||||
char *name = NULL, *halt = NULL, *delay = NULL;
|
char *name = NULL, *halt = NULL, *delay = NULL;
|
||||||
char *id = NULL, *env = NULL, *cgroup = NULL;
|
char *id = NULL, *env = NULL, *cgroup = NULL;
|
||||||
|
struct tty tty = { 0 };
|
||||||
|
char *dev = NULL;
|
||||||
int levels = 0;
|
int levels = 0;
|
||||||
int manual = 0;
|
int manual = 0;
|
||||||
char *line;
|
char *line;
|
||||||
@@ -1103,7 +1121,7 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd = strtok(line, " ");
|
cmd = strtok(line, " \t");
|
||||||
if (!cmd) {
|
if (!cmd) {
|
||||||
incomplete:
|
incomplete:
|
||||||
_e("Incomplete service '%s', cannot register", cfg);
|
_e("Incomplete service '%s', cannot register", cfg);
|
||||||
@@ -1111,6 +1129,9 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
|
|||||||
}
|
}
|
||||||
|
|
||||||
while (cmd) {
|
while (cmd) {
|
||||||
|
if (type == SVC_TYPE_TTY && cmd[0] == '@')
|
||||||
|
break; /* @console */
|
||||||
|
|
||||||
if (cmd[0] == '@') /* @username[:group] */
|
if (cmd[0] == '@') /* @username[:group] */
|
||||||
username = &cmd[1];
|
username = &cmd[1];
|
||||||
else if (cmd[0] == '[') /* [runlevels] */
|
else if (cmd[0] == '[') /* [runlevels] */
|
||||||
@@ -1155,7 +1176,40 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
|
|||||||
if (!id)
|
if (!id)
|
||||||
id = "";
|
id = "";
|
||||||
|
|
||||||
|
if (type == SVC_TYPE_TTY) {
|
||||||
|
size_t i, len = 0;
|
||||||
|
|
||||||
|
if (tty_parse_args(cmd, &tty))
|
||||||
|
return errno;
|
||||||
|
|
||||||
|
if (tty.cmd)
|
||||||
|
len += strlen(tty.cmd);
|
||||||
|
len += tty.num + 2;
|
||||||
|
for (i = 0; i < tty.num; i++)
|
||||||
|
len += strlen(tty.args[i]);
|
||||||
|
|
||||||
|
line = alloca(len);
|
||||||
|
if (!line)
|
||||||
|
return errno;
|
||||||
|
|
||||||
|
snprintf(line, len, "%s ", tty.cmd ?: "tty");
|
||||||
|
for (i = 0; i < tty.num; i++) {
|
||||||
|
strlcat(line, tty.args[i], len);
|
||||||
|
strlcat(line, " ", len);
|
||||||
|
}
|
||||||
|
cmd = strtok(line, " \t");
|
||||||
|
if (!cmd)
|
||||||
|
return errno;
|
||||||
|
|
||||||
|
if (tty_isatcon(tty.dev))
|
||||||
|
dev = tty_atcon();
|
||||||
|
else
|
||||||
|
dev = tty.dev;
|
||||||
|
next:
|
||||||
|
svc = svc_find_by_tty(dev);
|
||||||
|
} else
|
||||||
svc = svc_find(cmd, id);
|
svc = svc_find(cmd, id);
|
||||||
|
|
||||||
if (!svc) {
|
if (!svc) {
|
||||||
_d("Creating new svc for %s id #%s type %d", cmd, id, type);
|
_d("Creating new svc for %s id #%s type %d", cmd, id, type);
|
||||||
svc = svc_new(cmd, id, type);
|
svc = svc_new(cmd, id, type);
|
||||||
@@ -1190,14 +1244,51 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
|
|||||||
getcgroup(svc->group, sizeof(svc->group));
|
getcgroup(svc->group, sizeof(svc->group));
|
||||||
}
|
}
|
||||||
|
|
||||||
parse_cmdline_args(svc, cmd);
|
|
||||||
|
|
||||||
svc->runlevels = levels;
|
svc->runlevels = levels;
|
||||||
_d("Service %s runlevel 0x%02x", svc->cmd, svc->runlevels);
|
_d("Service %s runlevel 0x%02x", svc->cmd, svc->runlevels);
|
||||||
|
|
||||||
conf_parse_cond(svc, cond);
|
conf_parse_cond(svc, cond);
|
||||||
|
|
||||||
|
if (type == SVC_TYPE_TTY) {
|
||||||
|
char *ptr;
|
||||||
|
|
||||||
|
if (dev)
|
||||||
|
strlcpy(svc->dev, dev, sizeof(svc->dev));
|
||||||
|
if (tty.baud)
|
||||||
|
strlcpy(svc->baud, tty.baud, sizeof(svc->baud));
|
||||||
|
if (tty.term)
|
||||||
|
strlcpy(svc->term, tty.term, sizeof(svc->term));
|
||||||
|
svc->noclear = tty.noclear;
|
||||||
|
svc->nowait = tty.nowait;
|
||||||
|
svc->nologin = tty.nologin;
|
||||||
|
svc->notty = tty.notty;
|
||||||
|
|
||||||
|
/* TTYs cannot be redirected */
|
||||||
|
log = NULL;
|
||||||
|
|
||||||
|
/* Create name:id tuple for identiy, e.g., tty:S0 */
|
||||||
|
ptr = strrchr(svc->dev, '/');
|
||||||
|
if (ptr) {
|
||||||
|
ptr++;
|
||||||
|
if (!strncmp(ptr, "tty", 3))
|
||||||
|
ptr += 3;
|
||||||
|
} else
|
||||||
|
ptr = svc->dev;
|
||||||
|
if (!id || id[0] == 0)
|
||||||
|
id = ptr;
|
||||||
|
strlcpy(svc->name, "tty", sizeof(svc->name));
|
||||||
|
strlcpy(svc->id, id, sizeof(svc->id));
|
||||||
|
} else
|
||||||
parse_name(svc, name);
|
parse_name(svc, name);
|
||||||
|
|
||||||
|
parse_cmdline_args(svc, cmd);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Warn if svc generates same condition (based on name:id)
|
||||||
|
* as an existing service.
|
||||||
|
*/
|
||||||
|
svc_validate(svc);
|
||||||
|
|
||||||
if (halt)
|
if (halt)
|
||||||
parse_sighalt(svc, halt);
|
parse_sighalt(svc, halt);
|
||||||
if (delay)
|
if (delay)
|
||||||
@@ -1206,6 +1297,8 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
|
|||||||
parse_log(svc, log);
|
parse_log(svc, log);
|
||||||
if (desc)
|
if (desc)
|
||||||
strlcpy(svc->desc, desc, sizeof(svc->desc));
|
strlcpy(svc->desc, desc, sizeof(svc->desc));
|
||||||
|
else if (type == SVC_TYPE_TTY)
|
||||||
|
snprintf(svc->desc, sizeof(svc->desc), "Getty on %s", svc->dev);
|
||||||
if (env)
|
if (env)
|
||||||
parse_env(svc, env);
|
parse_env(svc, env);
|
||||||
if (file)
|
if (file)
|
||||||
@@ -1231,6 +1324,13 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file)
|
|||||||
if (!file)
|
if (!file)
|
||||||
svc->protect = 1;
|
svc->protect = 1;
|
||||||
|
|
||||||
|
/* continue expanding any 'tty @console ...' */
|
||||||
|
if (tty_isatcon(tty.dev)) {
|
||||||
|
dev = tty_atcon();
|
||||||
|
if (dev)
|
||||||
|
goto next;
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1258,9 +1358,6 @@ void service_monitor(pid_t lost, int status)
|
|||||||
if (fexist(SYNC_SHUTDOWN) || lost <= 1)
|
if (fexist(SYNC_SHUTDOWN) || lost <= 1)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (tty_respawn(lost))
|
|
||||||
return;
|
|
||||||
|
|
||||||
svc = svc_find_by_pid(lost);
|
svc = svc_find_by_pid(lost);
|
||||||
if (!svc) {
|
if (!svc) {
|
||||||
_d("collected unknown PID %d", lost);
|
_d("collected unknown PID %d", lost);
|
||||||
@@ -1276,7 +1373,7 @@ void service_monitor(pid_t lost, int status)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
/* Try removing PID file (in case service does not clean up after itself) */
|
/* Try removing PID file (in case service does not clean up after itself) */
|
||||||
if (svc_is_daemon(svc)) {
|
if (svc_is_daemon(svc) || svc_is_tty(svc)) {
|
||||||
service_cleanup(svc);
|
service_cleanup(svc);
|
||||||
} else if (svc_is_runtask(svc)) {
|
} else if (svc_is_runtask(svc)) {
|
||||||
/* run/task should run at least once per runlevel */
|
/* run/task should run at least once per runlevel */
|
||||||
@@ -1342,6 +1439,7 @@ static void service_retry(svc_t *svc)
|
|||||||
|
|
||||||
if (svc->state != SVC_HALTED_STATE ||
|
if (svc->state != SVC_HALTED_STATE ||
|
||||||
svc->block != SVC_BLOCK_RESTARTING) {
|
svc->block != SVC_BLOCK_RESTARTING) {
|
||||||
|
if (!svc_is_tty(svc))
|
||||||
_d("%s not crashing anymore", svc->cmd);
|
_d("%s not crashing anymore", svc->cmd);
|
||||||
*restart_cnt = 0;
|
*restart_cnt = 0;
|
||||||
return;
|
return;
|
||||||
@@ -1376,7 +1474,7 @@ static void svc_set_state(svc_t *svc, svc_state_t new)
|
|||||||
*state = new;
|
*state = new;
|
||||||
|
|
||||||
/* if PID isn't collected within SVC_TERM_TIMEOUT msec, kill it! */
|
/* if PID isn't collected within SVC_TERM_TIMEOUT msec, kill it! */
|
||||||
if ((*state == SVC_STOPPING_STATE)) {
|
if (*state == SVC_STOPPING_STATE) {
|
||||||
_d("%s is stopping, wait %d sec before sending SIGKILL ...",
|
_d("%s is stopping, wait %d sec before sending SIGKILL ...",
|
||||||
svc->cmd, svc->killdelay / 1000);
|
svc->cmd, svc->killdelay / 1000);
|
||||||
service_timeout_cancel(svc);
|
service_timeout_cancel(svc);
|
||||||
@@ -1421,15 +1519,13 @@ restart:
|
|||||||
if (!svc->pid) {
|
if (!svc->pid) {
|
||||||
char cond[MAX_COND_LEN];
|
char cond[MAX_COND_LEN];
|
||||||
|
|
||||||
/* PID was collected normally, no need to kill it */
|
_d("%s: stopped, cleaning up timers and conditions ...", svc->cmd);
|
||||||
_d("%s: stopped normally, no need to send SIGKILL :)", svc->cmd);
|
|
||||||
service_timeout_cancel(svc);
|
service_timeout_cancel(svc);
|
||||||
|
|
||||||
_d("%s: clearing pid condition ...", svc->name);
|
|
||||||
cond_clear(mkcond(svc, cond, sizeof(cond)));
|
cond_clear(mkcond(svc, cond, sizeof(cond)));
|
||||||
|
|
||||||
switch (svc->type) {
|
switch (svc->type) {
|
||||||
case SVC_TYPE_SERVICE:
|
case SVC_TYPE_SERVICE:
|
||||||
|
case SVC_TYPE_TTY:
|
||||||
svc_set_state(svc, SVC_HALTED_STATE);
|
svc_set_state(svc, SVC_HALTED_STATE);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -1477,7 +1573,7 @@ restart:
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!svc->pid) {
|
if (!svc->pid) {
|
||||||
if (svc_is_daemon(svc)) {
|
if (svc_is_daemon(svc) || svc_is_tty(svc)) {
|
||||||
svc_restarting(svc);
|
svc_restarting(svc);
|
||||||
svc_set_state(svc, SVC_HALTED_STATE);
|
svc_set_state(svc, SVC_HALTED_STATE);
|
||||||
|
|
||||||
@@ -1596,7 +1692,7 @@ void service_step_all(int types)
|
|||||||
|
|
||||||
void service_worker(void *unused)
|
void service_worker(void *unused)
|
||||||
{
|
{
|
||||||
service_step_all(SVC_TYPE_SERVICE | SVC_TYPE_RUNTASK);
|
service_step_all(SVC_TYPE_RESPAWN | SVC_TYPE_RUNTASK);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -206,10 +206,6 @@ restart:
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* No TTYs run at bootstrap, they have a delayed start. */
|
|
||||||
if (prevlevel > 0)
|
|
||||||
tty_runlevel();
|
|
||||||
|
|
||||||
sm->state = SM_RUNNING_STATE;
|
sm->state = SM_RUNNING_STATE;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -224,8 +220,7 @@ restart:
|
|||||||
_d("Stopping services not allowed after reconf ...");
|
_d("Stopping services not allowed after reconf ...");
|
||||||
sm->in_teardown = 1;
|
sm->in_teardown = 1;
|
||||||
cond_reload();
|
cond_reload();
|
||||||
service_step_all(SVC_TYPE_SERVICE);
|
service_step_all(SVC_TYPE_ANY);
|
||||||
tty_reload(NULL);
|
|
||||||
|
|
||||||
sm->state = SM_RELOAD_WAIT_STATE;
|
sm->state = SM_RELOAD_WAIT_STATE;
|
||||||
break;
|
break;
|
||||||
@@ -242,16 +237,17 @@ restart:
|
|||||||
}
|
}
|
||||||
|
|
||||||
sm->in_teardown = 0;
|
sm->in_teardown = 0;
|
||||||
/* Cleanup stale services */
|
|
||||||
svc_clean_dynamic(service_unregister);
|
|
||||||
|
|
||||||
_d("Starting services after reconf ...");
|
_d("Starting services after reconf ...");
|
||||||
service_step_all(SVC_TYPE_SERVICE);
|
service_step_all(SVC_TYPE_ANY);
|
||||||
|
|
||||||
|
/* Cleanup stale services */
|
||||||
|
svc_clean_dynamic(service_unregister);
|
||||||
|
|
||||||
_d("Calling reconf hooks ...");
|
_d("Calling reconf hooks ...");
|
||||||
plugin_run_hooks(HOOK_SVC_RECONF);
|
plugin_run_hooks(HOOK_SVC_RECONF);
|
||||||
|
|
||||||
service_step_all(SVC_TYPE_SERVICE);
|
service_step_all(SVC_TYPE_ANY);
|
||||||
_d("Reconfiguration done");
|
_d("Reconfiguration done");
|
||||||
|
|
||||||
sm->state = SM_RUNNING_STATE;
|
sm->state = SM_RUNNING_STATE;
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ svc_t *svc_new(char *cmd, char *id, int type)
|
|||||||
|
|
||||||
/* Find first job n:o if registering multiple instances */
|
/* Find first job n:o if registering multiple instances */
|
||||||
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
|
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
|
||||||
if (!strcmp(svc->cmd, cmd)) {
|
if (cmd && !strcmp(svc->cmd, cmd)) {
|
||||||
job = svc->job;
|
job = svc->job;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -130,12 +130,16 @@ svc_t *svc_new(char *cmd, char *id, int type)
|
|||||||
svc->job = job;
|
svc->job = job;
|
||||||
if (id && id[0])
|
if (id && id[0])
|
||||||
strlcpy(svc->id, id, sizeof(svc->id));
|
strlcpy(svc->id, id, sizeof(svc->id));
|
||||||
|
if (cmd)
|
||||||
strlcpy(svc->cmd, cmd, sizeof(svc->cmd));
|
strlcpy(svc->cmd, cmd, sizeof(svc->cmd));
|
||||||
|
|
||||||
/* Default description, if missing */
|
/* Default description, if missing */
|
||||||
strlcpy(svc->desc, svc->name, sizeof(svc->desc));
|
strlcpy(svc->desc, svc->name, sizeof(svc->desc));
|
||||||
|
|
||||||
/* Default HALT signal to send */
|
/* Default HALT signal to send */
|
||||||
|
if (svc_is_tty(svc))
|
||||||
|
svc->sighalt = SIGHUP;
|
||||||
|
else
|
||||||
svc->sighalt = SIGTERM;
|
svc->sighalt = SIGTERM;
|
||||||
|
|
||||||
/* Default delay between SIGTERM and SIGKILL */
|
/* Default delay between SIGTERM and SIGKILL */
|
||||||
@@ -188,6 +192,8 @@ void svc_validate(svc_t *svc)
|
|||||||
for (s = svc_iterator(&iter, 1); s; s = svc_iterator(&iter, 0)) {
|
for (s = svc_iterator(&iter, 1); s; s = svc_iterator(&iter, 0)) {
|
||||||
char c[MAX_COND_LEN];
|
char c[MAX_COND_LEN];
|
||||||
|
|
||||||
|
if (s->removed)
|
||||||
|
continue;
|
||||||
if (s == svc)
|
if (s == svc)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
@@ -327,7 +333,7 @@ svc_t *svc_stop_completed(void)
|
|||||||
svc_t *svc, *iter = NULL;
|
svc_t *svc, *iter = NULL;
|
||||||
|
|
||||||
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
|
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
|
||||||
if (svc->state == SVC_STOPPING_STATE)
|
if (svc->state == SVC_STOPPING_STATE && svc->pid > 1)
|
||||||
return svc;
|
return svc;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -422,6 +428,26 @@ svc_t *svc_find_by_nameid(char *name, char *id)
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
svc_t *svc_find_by_tty(char *dev)
|
||||||
|
{
|
||||||
|
svc_t *svc, *iter = NULL;
|
||||||
|
|
||||||
|
/* this is valid for fallback shells */
|
||||||
|
if (!dev)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
|
||||||
|
if (!svc_is_tty(svc))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!strcmp(dev, svc->dev))
|
||||||
|
return svc;
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* svc_find_by_plidfile - Find a service by its PID file
|
* svc_find_by_plidfile - Find a service by its PID file
|
||||||
* @fn: PID file, can be absolute path or relative to /run
|
* @fn: PID file, can be absolute path or relative to /run
|
||||||
@@ -581,6 +607,9 @@ int svc_enabled(svc_t *svc)
|
|||||||
if (svc_is_missing(svc))
|
if (svc_is_missing(svc))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (svc_is_tty(svc) && bootstrap)
|
||||||
|
return 0;
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,10 +42,12 @@ typedef enum {
|
|||||||
SVC_TYPE_SERVICE = 1, /* Monitored, will be respawned */
|
SVC_TYPE_SERVICE = 1, /* Monitored, will be respawned */
|
||||||
SVC_TYPE_TASK = 2, /* One-shot, runs in parallell */
|
SVC_TYPE_TASK = 2, /* One-shot, runs in parallell */
|
||||||
SVC_TYPE_RUN = 4, /* Like task, but wait for completion */
|
SVC_TYPE_RUN = 4, /* Like task, but wait for completion */
|
||||||
|
SVC_TYPE_TTY = 8, /* Like service, but dedicated to TTYs */
|
||||||
SVC_TYPE_SYSV = 32, /* SysV style init.d script w/ start/stop */
|
SVC_TYPE_SYSV = 32, /* SysV style init.d script w/ start/stop */
|
||||||
} svc_type_t;
|
} svc_type_t;
|
||||||
|
|
||||||
#define SVC_TYPE_ANY (-1)
|
#define SVC_TYPE_ANY (-1)
|
||||||
|
#define SVC_TYPE_RESPAWN (SVC_TYPE_SERVICE | SVC_TYPE_TTY)
|
||||||
#define SVC_TYPE_RUNTASK (SVC_TYPE_RUN | SVC_TYPE_TASK | SVC_TYPE_SYSV)
|
#define SVC_TYPE_RUNTASK (SVC_TYPE_RUN | SVC_TYPE_TASK | SVC_TYPE_SYSV)
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
@@ -125,7 +127,8 @@ typedef struct svc {
|
|||||||
char once; /* run/task, (at least) once per runlevel */
|
char once; /* run/task, (at least) once per runlevel */
|
||||||
const char restart_cnt; /* Incremented for each restart by service monitor. */
|
const char restart_cnt; /* Incremented for each restart by service monitor. */
|
||||||
|
|
||||||
/* Set for services we need to redirect stdout/stderr to syslog */
|
union {
|
||||||
|
/* services we redirect stdout/stderr to syslog (not TTYs!) */
|
||||||
struct {
|
struct {
|
||||||
char enabled;
|
char enabled;
|
||||||
char null;
|
char null;
|
||||||
@@ -135,6 +138,18 @@ typedef struct svc {
|
|||||||
char ident[20];
|
char ident[20];
|
||||||
} log;
|
} log;
|
||||||
|
|
||||||
|
/* Only for TTY type services */
|
||||||
|
struct {
|
||||||
|
char dev[32];
|
||||||
|
char baud[10];
|
||||||
|
char term[10];
|
||||||
|
char noclear;
|
||||||
|
char nowait;
|
||||||
|
char nologin;
|
||||||
|
char notty;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
/* Identity */
|
/* Identity */
|
||||||
char username[MAX_USER_LEN];
|
char username[MAX_USER_LEN];
|
||||||
char group[MAX_USER_LEN];
|
char group[MAX_USER_LEN];
|
||||||
@@ -165,6 +180,7 @@ svc_t *svc_find (char *cmd, char *id);
|
|||||||
svc_t *svc_find_by_pid (pid_t pid);
|
svc_t *svc_find_by_pid (pid_t pid);
|
||||||
svc_t *svc_find_by_jobid (int job, char *id);
|
svc_t *svc_find_by_jobid (int job, char *id);
|
||||||
svc_t *svc_find_by_nameid (char *name, char *id);
|
svc_t *svc_find_by_nameid (char *name, char *id);
|
||||||
|
svc_t *svc_find_by_tty (char *dev);
|
||||||
svc_t *svc_find_by_pidfile (char *fn);
|
svc_t *svc_find_by_pidfile (char *fn);
|
||||||
|
|
||||||
svc_t *svc_iterator (svc_t **iter, int first);
|
svc_t *svc_iterator (svc_t **iter, int first);
|
||||||
@@ -191,6 +207,7 @@ int svc_parse_jobstr (char *str, size_t len, int (*found)(svc_t *)
|
|||||||
|
|
||||||
static inline int svc_is_daemon (svc_t *svc) { return svc && SVC_TYPE_SERVICE == svc->type; }
|
static inline int svc_is_daemon (svc_t *svc) { return svc && SVC_TYPE_SERVICE == svc->type; }
|
||||||
static inline int svc_is_sysv (svc_t *svc) { return svc && SVC_TYPE_SYSV == svc->type; }
|
static inline int svc_is_sysv (svc_t *svc) { return svc && SVC_TYPE_SYSV == svc->type; }
|
||||||
|
static inline int svc_is_tty (svc_t *svc) { return svc && SVC_TYPE_TTY == svc->type; }
|
||||||
static inline int svc_is_runtask (svc_t *svc) { return svc && (SVC_TYPE_RUNTASK & svc->type);}
|
static inline int svc_is_runtask (svc_t *svc) { return svc && (SVC_TYPE_RUNTASK & svc->type);}
|
||||||
static inline int svc_is_forking (svc_t *svc) { return (svc_is_daemon(svc) || svc_is_sysv(svc)) && svc->pidfile[0] == '!'; }
|
static inline int svc_is_forking (svc_t *svc) { return (svc_is_daemon(svc) || svc_is_sysv(svc)) && svc->pidfile[0] == '!'; }
|
||||||
|
|
||||||
@@ -229,6 +246,7 @@ static inline int svc_has_cond(svc_t *svc)
|
|||||||
case SVC_TYPE_SERVICE:
|
case SVC_TYPE_SERVICE:
|
||||||
case SVC_TYPE_TASK:
|
case SVC_TYPE_TASK:
|
||||||
case SVC_TYPE_RUN:
|
case SVC_TYPE_RUN:
|
||||||
|
case SVC_TYPE_TTY:
|
||||||
case SVC_TYPE_SYSV:
|
case SVC_TYPE_SYSV:
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
|
|||||||
@@ -35,24 +35,22 @@
|
|||||||
#include "finit.h"
|
#include "finit.h"
|
||||||
#include "conf.h"
|
#include "conf.h"
|
||||||
#include "helpers.h"
|
#include "helpers.h"
|
||||||
|
#include "service.h"
|
||||||
#include "tty.h"
|
#include "tty.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "utmp-api.h"
|
#include "utmp-api.h"
|
||||||
|
|
||||||
#ifdef FALLBACK_SHELL
|
char *tty_canonicalize(char *dev)
|
||||||
static pid_t fallback = 0;
|
|
||||||
#endif
|
|
||||||
static LIST_HEAD(, tty) tty_list = LIST_HEAD_INITIALIZER();
|
|
||||||
|
|
||||||
static char *canonicalize(char *tty)
|
|
||||||
{
|
{
|
||||||
struct stat st;
|
|
||||||
static char path[80];
|
static char path[80];
|
||||||
|
struct stat st;
|
||||||
|
|
||||||
if (!tty)
|
if (!dev)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
if (tty_isatcon(dev))
|
||||||
|
return dev;
|
||||||
|
|
||||||
strlcpy(path, tty, sizeof(path));
|
strlcpy(path, dev, sizeof(path));
|
||||||
if (stat(path, &st)) {
|
if (stat(path, &st)) {
|
||||||
if (!strncmp(path, _PATH_DEV, strlen(_PATH_DEV))) {
|
if (!strncmp(path, _PATH_DEV, strlen(_PATH_DEV))) {
|
||||||
unavailable:
|
unavailable:
|
||||||
@@ -60,7 +58,7 @@ static char *canonicalize(char *tty)
|
|||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(path, sizeof(path), "%s%s", _PATH_DEV, tty);
|
snprintf(path, sizeof(path), "%s%s", _PATH_DEV, dev);
|
||||||
if (stat(path, &st))
|
if (stat(path, &st))
|
||||||
goto unavailable;
|
goto unavailable;
|
||||||
}
|
}
|
||||||
@@ -71,37 +69,65 @@ static char *canonicalize(char *tty)
|
|||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
void tty_mark(void)
|
/*
|
||||||
|
* The @console syntax is a wildcard to match the system console(s) given
|
||||||
|
* on the kernel cmdline. As such it can match multiple, or even none.
|
||||||
|
*/
|
||||||
|
int tty_isatcon(char *dev)
|
||||||
{
|
{
|
||||||
struct tty *tty;
|
return dev && !strcmp(dev, "@console");
|
||||||
|
|
||||||
LIST_FOREACH(tty, &tty_list, link)
|
|
||||||
tty->dirty = -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void tty_sweep(void)
|
/*
|
||||||
|
* Returns console TTYs known by the kernel, from cmdline
|
||||||
|
*/
|
||||||
|
char *tty_atcon(void)
|
||||||
{
|
{
|
||||||
struct tty *tty, *tmp;
|
static char *buf = NULL;
|
||||||
|
static char *save;
|
||||||
|
char *ptr = NULL;
|
||||||
|
char *dev;
|
||||||
|
|
||||||
LIST_FOREACH_SAFE(tty, &tty_list, link, tmp) {
|
if (!buf) {
|
||||||
if (!tty->dirty)
|
FILE *fp;
|
||||||
continue;
|
|
||||||
|
|
||||||
_d("TTY %s dirty, stopping ...", tty->name);
|
fp = fopen("/sys/class/tty/console/active", "r");
|
||||||
tty_stop(tty);
|
if (!fp) {
|
||||||
|
_e("Cannot find system console, is sysfs not mounted?");
|
||||||
if (tty->dirty == -1) {
|
errno = ENOENT;
|
||||||
_d("TTY %s removed, cleaning up.", tty->name);
|
return NULL;
|
||||||
tty_unregister(tty);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
buf = malloc(512);
|
||||||
|
if (!buf) {
|
||||||
|
_pe("Failed allocating memory for @console");
|
||||||
|
fclose(fp);
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!fgets(buf, 512, fp)) {
|
||||||
|
fclose(fp);
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
fclose(fp);
|
||||||
|
|
||||||
|
ptr = chomp(buf);
|
||||||
|
_d("consoles: %s", ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
dev = strtok_r(ptr, " \t", &save);
|
||||||
|
if (!dev) {
|
||||||
|
done:
|
||||||
|
free(buf);
|
||||||
|
return buf = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* tty_register - Register a getty on a device
|
* tty_parse_args - Parse cmdline args for a tty
|
||||||
* @line: Configuration, text after initial "tty"
|
* @cmd: command or tty
|
||||||
* @rlimit: Limits for this service/run/task, may be global limits
|
|
||||||
* @file: The file name TTY was loaded from
|
|
||||||
*
|
*
|
||||||
* A Finit tty line can use the internal getty implementation or an
|
* A Finit tty line can use the internal getty implementation or an
|
||||||
* external one, like the BusyBox getty for instance. This function
|
* external one, like the BusyBox getty for instance. This function
|
||||||
@@ -119,66 +145,58 @@ void tty_sweep(void)
|
|||||||
* Different getty implementations prefer the TTY device argument in
|
* Different getty implementations prefer the TTY device argument in
|
||||||
* different order, so take care to investigate this first.
|
* different order, so take care to investigate this first.
|
||||||
*/
|
*/
|
||||||
int tty_register(char *line, struct rlimit rlimit[], char *file)
|
int tty_parse_args(char *cmd, struct tty *tty)
|
||||||
{
|
{
|
||||||
struct tty *entry;
|
char *dev = NULL;
|
||||||
size_t i, num = 0;
|
size_t i;
|
||||||
char *tok, *cmd = NULL, *args[TTY_MAX_ARGS], buf[256];
|
|
||||||
char *dev = NULL, *baud = NULL;
|
|
||||||
char *runlevels = NULL, *term = NULL;
|
|
||||||
int insert = 0, noclear = 0, nowait = 0, nologin = 0, atcon = 0;
|
|
||||||
|
|
||||||
if (!line) {
|
do {
|
||||||
_e("Missing argument");
|
_d("token %s", cmd);
|
||||||
return errno = EINVAL;
|
if (!strcmp(cmd, "noclear"))
|
||||||
}
|
tty->noclear = 1;
|
||||||
|
else if (!strcmp(cmd, "nowait"))
|
||||||
/*
|
tty->nowait = 1;
|
||||||
* Split line in separate arguments. For an external getty
|
else if (!strcmp(cmd, "nologin"))
|
||||||
* this is used with execv(), for the built-in it simplifies
|
tty->nologin = 1;
|
||||||
* further translation.
|
else if (!strcmp(cmd, "notty"))
|
||||||
*/
|
tty->notty = 1; /* for fallback shell */
|
||||||
tok = strtok(line, " \t");
|
else if (!access(cmd, X_OK))
|
||||||
while (tok && num < NELEMS(args)) {
|
tty->cmd = cmd;
|
||||||
if (!strcmp(tok, "noclear"))
|
|
||||||
noclear = 1;
|
|
||||||
else if (!strcmp(tok, "nowait"))
|
|
||||||
nowait = 1;
|
|
||||||
else if (!strcmp(tok, "nologin"))
|
|
||||||
nologin = 1;
|
|
||||||
else
|
else
|
||||||
args[num++] = tok;
|
tty->args[tty->num++] = cmd;
|
||||||
|
|
||||||
tok = strtok(NULL, " \t");
|
cmd = strtok(NULL, " \t");
|
||||||
}
|
} while (cmd && tty->num < NELEMS(tty->args));
|
||||||
|
|
||||||
|
/* skip /dev probe, we just want a bríngup shell */
|
||||||
|
if (tty->notty)
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* Iterate over all args */
|
/* Iterate over all args */
|
||||||
for (i = 0; i < num; i++) {
|
for (i = 0; i < tty->num; i++) {
|
||||||
|
_d("Checking arg %s for dev and cmd ...", tty->args[i]);
|
||||||
/*
|
/*
|
||||||
* First, figure out if built-in or external getty
|
* First, figure out if built-in or external getty
|
||||||
* tty [12345] /dev/ttyAMA0 115200 noclear vt220 # built-in
|
* tty [12345] /dev/ttyAMA0 115200 noclear vt220 # built-in
|
||||||
* tty [12345] /sbin/getty -L 115200 @console vt100 noclear # external
|
* tty [12345] /sbin/getty -L 115200 @console vt100 noclear # external
|
||||||
*/
|
*/
|
||||||
if ((!cmd && !dev) || (cmd && !dev)) {
|
if (!dev) {
|
||||||
if (args[i][0] == '[')
|
if (!strcmp(tty->args[i], "@console"))
|
||||||
runlevels = line;
|
dev = tty->args[i];
|
||||||
if (!strcmp(args[i], "@console"))
|
if (!strncmp(tty->args[i], "/dev", 4))
|
||||||
dev = args[i];
|
dev = tty->args[i];
|
||||||
if (!strncmp(args[i], "/dev", 4))
|
if (!strncmp(tty->args[i], "tty", 3) || !strcmp(tty->args[i], "console"))
|
||||||
dev = args[i];
|
dev = tty->args[i];
|
||||||
if (!strncmp(args[i], "tty", 3) || !strcmp(args[i], "console"))
|
|
||||||
dev = args[i];
|
|
||||||
if (!access(args[i], X_OK))
|
|
||||||
cmd = args[i];
|
|
||||||
|
|
||||||
/* The first arg must be one of the above */
|
/* The first arg must be one of the above */
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Built-in getty args */
|
/* Built-in getty args */
|
||||||
if (!cmd && dev) {
|
if (!tty->cmd && dev) {
|
||||||
if (isdigit(args[i][0])) {
|
_d("Found dev %s for built-in getty", dev);
|
||||||
baud = args[i];
|
if (isdigit(tty->args[i][0])) {
|
||||||
|
tty->baud = tty->args[i];
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -186,288 +204,46 @@ int tty_register(char *line, struct rlimit rlimit[], char *file)
|
|||||||
* Last arg, if not anything else, is the value
|
* Last arg, if not anything else, is the value
|
||||||
* to be used for the TERM environment variable.
|
* to be used for the TERM environment variable.
|
||||||
*/
|
*/
|
||||||
if (i + 1 == num)
|
if (i + 1 == tty->num)
|
||||||
term = args[i];
|
tty->term = tty->args[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dev) {
|
tty->dev = tty_canonicalize(dev);
|
||||||
error:
|
if (!tty->dev) {
|
||||||
_e("Incomplete or non-existing TTY device given, cannot register.");
|
_e("Incomplete or non-existing TTY device given, cannot register.");
|
||||||
return errno = EINVAL;
|
return errno = EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Auto-detect serial console, for embedded devices mostly */
|
_d("Registering %s getty on TTY %s at %s baud with term %s", tty->cmd ? "external" : "built-in",
|
||||||
if (!strcmp(dev, "@console")) {
|
tty->dev, tty->baud ?: "0", tty->term ?: "N/A");
|
||||||
FILE *fp;
|
|
||||||
|
|
||||||
fp = fopen("/sys/class/tty/console/active", "r");
|
|
||||||
if (!fp) {
|
|
||||||
_e("Cannot find system console, is sysfs not mounted?");
|
|
||||||
return errno = ENOENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
atcon = 1;
|
|
||||||
if (fgets(buf, sizeof(buf), fp))
|
|
||||||
dev = strtok(chomp(buf), " \t");
|
|
||||||
|
|
||||||
fclose(fp);
|
|
||||||
}
|
|
||||||
|
|
||||||
again:
|
|
||||||
/* Ensure all getty (built-in + external) are registered with absolute path */
|
|
||||||
dev = canonicalize(dev);
|
|
||||||
if (!dev)
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
entry = tty_find(dev);
|
|
||||||
if (!entry) {
|
|
||||||
entry = calloc(1, sizeof(*entry));
|
|
||||||
if (!entry)
|
|
||||||
return errno = ENOMEM;
|
|
||||||
insert = 1;
|
|
||||||
} else {
|
|
||||||
if (entry->cmd) {
|
|
||||||
free(entry->cmd);
|
|
||||||
entry->cmd = NULL;
|
|
||||||
for (i = 0; i < TTY_MAX_ARGS; i++) {
|
|
||||||
if (entry->args[i])
|
|
||||||
free(entry->args[i]);
|
|
||||||
entry->args[i] = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
insert = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
strlcpy(entry->name, dev, sizeof(entry->name));
|
|
||||||
strlcpy(entry->baud, baud ? baud : "", sizeof(entry->baud));
|
|
||||||
strlcpy(entry->term, term ? term : "", sizeof(entry->term));
|
|
||||||
entry->noclear = noclear;
|
|
||||||
entry->nowait = nowait;
|
|
||||||
entry->nologin = nologin;
|
|
||||||
entry->runlevels = conf_parse_runlevels(runlevels);
|
|
||||||
|
|
||||||
/* External getty */
|
|
||||||
if (cmd) {
|
|
||||||
int j = 0;
|
|
||||||
|
|
||||||
tok = strrchr(cmd, '/');
|
|
||||||
if (!tok)
|
|
||||||
tok = cmd;
|
|
||||||
else
|
|
||||||
tok++;
|
|
||||||
entry->cmd = strdup(cmd);
|
|
||||||
args[1] = strdup(tok);
|
|
||||||
|
|
||||||
for (i = 1; i < num; i++) {
|
|
||||||
char *arg = args[i];
|
|
||||||
|
|
||||||
/* Replace @console with actual device */
|
|
||||||
if (arg && !strcmp(arg, "@console"))
|
|
||||||
arg = dev;
|
|
||||||
if (arg)
|
|
||||||
entry->args[j++] = strdup(arg);
|
|
||||||
}
|
|
||||||
entry->args[++j] = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
_d("Registering %s getty on TTY %s at %s baud with term %s on runlevels %s",
|
|
||||||
cmd ? "external" : "built-in", dev, baud ?: "NULL", term ?: "N/A", runlevels ?: "[2-5]");
|
|
||||||
|
|
||||||
if (insert)
|
|
||||||
LIST_INSERT_HEAD(&tty_list, entry, link);
|
|
||||||
|
|
||||||
/* Register configured limits */
|
|
||||||
memcpy(entry->rlimit, rlimit, sizeof(entry->rlimit));
|
|
||||||
|
|
||||||
if (file && conf_changed(file))
|
|
||||||
entry->dirty = 1; /* Modified, restart */
|
|
||||||
else
|
|
||||||
entry->dirty = 0; /* Not modified */
|
|
||||||
_d("TTY %s is %sdirty", dev, entry->dirty ? "" : "NOT ");
|
|
||||||
|
|
||||||
if (atcon) {
|
|
||||||
dev = strtok(NULL, " \t");
|
|
||||||
if (dev) {
|
|
||||||
_d("Found another @console: %s", dev);
|
|
||||||
goto again;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int tty_unregister(struct tty *tty)
|
int tty_exists(char *dev)
|
||||||
{
|
|
||||||
if (!tty) {
|
|
||||||
_e("Missing argument");
|
|
||||||
return errno = EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
LIST_REMOVE(tty, link);
|
|
||||||
|
|
||||||
if (tty->cmd) {
|
|
||||||
int i;
|
|
||||||
|
|
||||||
free(tty->cmd);
|
|
||||||
for (i = 0; i < TTY_MAX_ARGS; i++) {
|
|
||||||
if (tty->args[i])
|
|
||||||
free(tty->args[i]);
|
|
||||||
tty->args[i] = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free(tty);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct tty *tty_find(char *dev)
|
|
||||||
{
|
|
||||||
struct tty *entry;
|
|
||||||
|
|
||||||
LIST_FOREACH(entry, &tty_list, link) {
|
|
||||||
if (!strcmp(dev, entry->name))
|
|
||||||
return entry;
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t tty_num(void)
|
|
||||||
{
|
|
||||||
size_t num = 0;
|
|
||||||
struct tty *entry;
|
|
||||||
|
|
||||||
LIST_FOREACH(entry, &tty_list, link)
|
|
||||||
num++;
|
|
||||||
|
|
||||||
return num;
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t tty_num_active(void)
|
|
||||||
{
|
|
||||||
size_t num = 0;
|
|
||||||
struct tty *entry;
|
|
||||||
|
|
||||||
LIST_FOREACH(entry, &tty_list, link) {
|
|
||||||
if (entry->pid)
|
|
||||||
num++;
|
|
||||||
}
|
|
||||||
|
|
||||||
return num;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct tty *tty_find_by_pid(pid_t pid)
|
|
||||||
{
|
|
||||||
struct tty *entry;
|
|
||||||
|
|
||||||
LIST_FOREACH(entry, &tty_list, link) {
|
|
||||||
if (entry->pid == pid)
|
|
||||||
return entry;
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int tty_exist(char *dev)
|
|
||||||
{
|
{
|
||||||
int fd, result;
|
int fd, result;
|
||||||
struct termios c;
|
struct termios c;
|
||||||
|
|
||||||
fd = open(dev, O_RDWR);
|
fd = open(dev, O_RDWR);
|
||||||
if (-1 == fd)
|
if (-1 == fd)
|
||||||
return 1;
|
return 0;
|
||||||
|
|
||||||
/* XXX: Add check for errno == EIO? */
|
/* XXX: Add check for errno == EIO? */
|
||||||
result = tcgetattr(fd, &c);
|
result = tcgetattr(fd, &c);
|
||||||
close(fd);
|
close(fd);
|
||||||
|
|
||||||
return result;
|
return result == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void tty_start(struct tty *tty)
|
int tty_exec(svc_t *tty)
|
||||||
{
|
{
|
||||||
|
char *args[MAX_NUM_SVC_ARGS];
|
||||||
char *dev;
|
char *dev;
|
||||||
|
int i, j;
|
||||||
|
|
||||||
if (tty->pid) {
|
if (tty->notty) {
|
||||||
_d("%s: TTY already active", tty->name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
dev = canonicalize(tty->name);
|
|
||||||
if (!dev) {
|
|
||||||
_d("%s: Cannot find TTY device: %s", tty->name, strerror(errno));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tty_exist(dev)) {
|
|
||||||
_d("%s: Not a valid TTY: %s", dev, strerror(errno));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (tty->nologin) {
|
|
||||||
_d("%s: Starting /bin/sh ...", dev);
|
|
||||||
tty->pid = run_sh(dev, tty->noclear, tty->nowait, tty->rlimit);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
_d("%s: Starting %sgetty ...", dev, !tty->cmd ? "built-in " : "");
|
|
||||||
if (!tty->cmd)
|
|
||||||
tty->pid = run_getty(dev, tty->baud, tty->term, tty->noclear, tty->nowait, tty->rlimit);
|
|
||||||
else
|
|
||||||
tty->pid = run_getty2(dev, tty->cmd, tty->args, tty->noclear, tty->nowait, tty->rlimit);
|
|
||||||
}
|
|
||||||
|
|
||||||
void tty_stop(struct tty *tty)
|
|
||||||
{
|
|
||||||
if (!tty->pid)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* XXX: TTY handling should be refactored to regular services,
|
|
||||||
* XXX: that way we could rely on the state machine to properly
|
|
||||||
* XXX: send SIGTERM, wait for max 2 sec to collect PID before
|
|
||||||
* XXX: sending SIGKILL.
|
|
||||||
*/
|
|
||||||
_d("Stopping TTY %s", tty->name);
|
|
||||||
kill(tty->pid, SIGKILL);
|
|
||||||
waitpid(tty->pid, NULL, 0);
|
|
||||||
tty->pid = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int tty_enabled(struct tty *tty)
|
|
||||||
{
|
|
||||||
if (!tty)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (ISSET(tty->runlevels, runlevel))
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Fallback shell if no TTYs are active
|
|
||||||
*/
|
|
||||||
int tty_fallback(pid_t lost)
|
|
||||||
{
|
|
||||||
#ifdef FALLBACK_SHELL
|
|
||||||
if (lost == 1) {
|
|
||||||
if (fallback) {
|
|
||||||
kill(fallback, SIGKILL);
|
|
||||||
fallback = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fallback != lost || tty_num_active())
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
fallback = fork();
|
|
||||||
if (fallback)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Become session leader and set controlling TTY
|
* Become session leader and set controlling TTY
|
||||||
* to enable Ctrl-C and job control in shell.
|
* to enable Ctrl-C and job control in shell.
|
||||||
@@ -476,79 +252,64 @@ int tty_fallback(pid_t lost)
|
|||||||
ioctl(STDIN_FILENO, TIOCSCTTY, 1);
|
ioctl(STDIN_FILENO, TIOCSCTTY, 1);
|
||||||
|
|
||||||
prctl(PR_SET_NAME, "finitsh", 0, 0, 0);
|
prctl(PR_SET_NAME, "finitsh", 0, 0, 0);
|
||||||
_exit(execl(_PATH_BSHELL, _PATH_BSHELL, NULL));
|
return execl(_PATH_BSHELL, _PATH_BSHELL, NULL);
|
||||||
#else
|
|
||||||
(void)lost;
|
|
||||||
#endif /* FALLBACK_SHELL */
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void tty_action(struct tty *tty)
|
dev = tty_canonicalize(tty->dev);
|
||||||
{
|
if (!dev) {
|
||||||
if (!tty_enabled(tty))
|
_d("%s: Cannot find TTY device: %s", tty->dev, strerror(errno));
|
||||||
tty_stop(tty);
|
return EX_CONFIG;
|
||||||
else
|
}
|
||||||
tty_start(tty);
|
|
||||||
|
if (!tty_exists(dev)) {
|
||||||
|
_d("%s: Not a valid TTY: %s", dev, strerror(errno));
|
||||||
|
return EX_OSFILE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tty->nologin) {
|
||||||
|
_d("%s: Starting /bin/sh ...", dev);
|
||||||
|
return run_sh(dev, tty->noclear, tty->nowait, tty->rlimit);
|
||||||
|
}
|
||||||
|
|
||||||
|
_d("%s: Starting %sgetty ...", dev, !tty->cmd ? "built-in " : "");
|
||||||
|
if (!strcmp(tty->cmd, "tty"))
|
||||||
|
return run_getty(dev, tty->baud, tty->term, tty->noclear, tty->nowait, tty->rlimit);
|
||||||
|
|
||||||
|
for (i = 1, j = 0; i < MAX_NUM_SVC_ARGS; i++) {
|
||||||
|
if (!tty->args[i][0])
|
||||||
|
break;
|
||||||
|
|
||||||
|
args[j++] = tty->args[i];
|
||||||
|
}
|
||||||
|
args[j++] = NULL;
|
||||||
|
|
||||||
|
return run_getty2(dev, tty->cmd, args, tty->noclear, tty->nowait, tty->rlimit);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* TTY monitor, called by service_monitor()
|
* Fallback shell if no TTYs are active
|
||||||
*/
|
*/
|
||||||
int tty_respawn(pid_t pid)
|
int tty_fallback(char *file)
|
||||||
{
|
{
|
||||||
struct tty *tty = tty_find_by_pid(pid);
|
svc_t *svc, *iter = NULL;
|
||||||
|
size_t num = 0;
|
||||||
|
|
||||||
if (!tty)
|
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
|
||||||
return tty_fallback(pid);
|
if (!svc_is_tty(svc) || svc_is_removed(svc))
|
||||||
|
continue;
|
||||||
/* Set DEAD_PROCESS UTMP entry */
|
num++;
|
||||||
utmp_set_dead(pid);
|
|
||||||
|
|
||||||
/* Clear PID to be able to respawn it. */
|
|
||||||
tty->pid = 0;
|
|
||||||
tty_action(tty);
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
#ifdef FALLBACK_SHELL
|
||||||
* Called after reload of /etc/finit.d/, stop/start TTYs
|
char line[32] = "tty [12345789] notty noclear";
|
||||||
*/
|
|
||||||
void tty_reload(char *dev)
|
|
||||||
{
|
|
||||||
struct tty *tty;
|
|
||||||
|
|
||||||
if (dev) {
|
if (!num) {
|
||||||
tty = tty_find(dev);
|
_d("No TTY active in configuration, enabling fallback shell.");
|
||||||
if (!tty) {
|
return service_register(SVC_TYPE_TTY, line, global_rlimit, file);
|
||||||
logit(LOG_WARNING, "No TTY registered for %s", dev);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
tty_action(tty);
|
return num == 0;
|
||||||
tty->dirty = 0;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
tty_sweep();
|
|
||||||
|
|
||||||
LIST_FOREACH(tty, &tty_list, link) {
|
|
||||||
tty_action(tty);
|
|
||||||
tty->dirty = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Start all TTYs that exist in the system and are allowed at this runlevel */
|
|
||||||
void tty_runlevel(void)
|
|
||||||
{
|
|
||||||
struct tty *tty;
|
|
||||||
|
|
||||||
LIST_FOREACH(tty, &tty_list, link)
|
|
||||||
tty_action(tty);
|
|
||||||
|
|
||||||
/* Start fallback shell if enabled && no TTYs */
|
|
||||||
tty_fallback(tty_num_active() > 0 ? 1 : 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -25,51 +25,33 @@
|
|||||||
#ifndef FINIT_TTY_H_
|
#ifndef FINIT_TTY_H_
|
||||||
#define FINIT_TTY_H_
|
#define FINIT_TTY_H_
|
||||||
|
|
||||||
#include <limits.h>
|
#include <stdio.h>
|
||||||
#include <sys/resource.h>
|
#include "svc.h"
|
||||||
#include <lite/queue.h> /* BSD sys/queue.h API */
|
|
||||||
|
|
||||||
#define TTY_MAX_ARGS 16
|
|
||||||
|
|
||||||
struct tty {
|
struct tty {
|
||||||
LIST_ENTRY(tty) link;
|
char *cmd;
|
||||||
|
char *args[MAX_NUM_SVC_ARGS];
|
||||||
|
size_t num;
|
||||||
|
|
||||||
char name[42];
|
char *dev;
|
||||||
char baud[10];
|
char *baud;
|
||||||
char term[10];
|
char *term;
|
||||||
int noclear;
|
char noclear;
|
||||||
int nowait;
|
char nowait;
|
||||||
int nologin;
|
char nologin;
|
||||||
int runlevels;
|
char notty;
|
||||||
|
|
||||||
char *cmd; /* NULL when running built-in getty */
|
|
||||||
char *args[TTY_MAX_ARGS];
|
|
||||||
|
|
||||||
int pid;
|
|
||||||
|
|
||||||
/* Limits and scoping */
|
|
||||||
struct rlimit rlimit[RLIMIT_NLIMITS];
|
|
||||||
|
|
||||||
/* Set if modified => reloaded, or -1 when marked for removal */
|
|
||||||
int dirty;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
void tty_mark (void);
|
char *tty_canonicalize (char *dev);
|
||||||
void tty_sweep (void);
|
|
||||||
|
|
||||||
int tty_register (char *line, struct rlimit rlimit[], char *file);
|
int tty_isatcon (char *dev);
|
||||||
int tty_unregister (struct tty *tty);
|
char *tty_atcon (void);
|
||||||
|
|
||||||
struct tty *tty_find (char *dev);
|
int tty_parse_args (char *cmdline, struct tty *tty);
|
||||||
size_t tty_num (void);
|
|
||||||
size_t tty_num_active (void);
|
int tty_exists (char *dev);
|
||||||
struct tty *tty_find_by_pid (pid_t pid);
|
int tty_exec (svc_t *tty);
|
||||||
void tty_start (struct tty *tty);
|
int tty_fallback (char *file);
|
||||||
void tty_stop (struct tty *tty);
|
|
||||||
int tty_enabled (struct tty *tty);
|
|
||||||
int tty_respawn (pid_t pid);
|
|
||||||
void tty_reload (char *dev);
|
|
||||||
void tty_runlevel (void);
|
|
||||||
|
|
||||||
#endif /* FINIT_TTY_H_ */
|
#endif /* FINIT_TTY_H_ */
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user