wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-25 12:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor fallback shell handling, run as regular service

Browse Source 
This patch re-enables the fallback shell handling after the big TTY
refactor.  We do this by allowing the fallback shell to run as a
regular service.

Note: this also adds the "hidden" support for 'notty' option for
      tty configurations stanzas.  This is just to pick up from
      where the kernel left us, reusing stdin + stdout.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2021-04-14 16:29:19 +02:00
1 parent 85a212ef93
commit c0368d2b16
6 files changed
+52 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/tty.c
+34 -31
View File
@@ -35,14 +35,11 @@
#include "finit.h"
#include "conf.h"
#include "helpers.h"
#include "service.h"
#include "tty.h"
#include "util.h"
#include "utmp-api.h"
#ifdef FALLBACK_SHELL
static pid_t fallback = 0;
#endif
char *tty_canonicalize(char *dev)
{
static char path[80];
@@ -134,12 +131,18 @@ int tty_parse_args(char *cmd, struct tty *tty)
tty->nowait = 1;
else if (!strcmp(cmd, "nologin"))
tty->nologin = 1;
else if (!strcmp(cmd, "notty"))
tty->notty = 1; /* for fallback shell */
else
tty->args[tty->num++] = cmd;
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 */
for (i = 0; i < tty->num; i++) {
_d("Checking arg %s for dev and cmd ...", tty->args[i]);
@@ -214,6 +217,18 @@ int tty_exec(svc_t *tty)
char *dev;
int rc;
if (tty->notty) {
/*
* Become session leader and set controlling TTY
* to enable Ctrl-C and job control in shell.
*/
setsid();
ioctl(STDIN_FILENO, TIOCSCTTY, 1);
prctl(PR_SET_NAME, "finitsh", 0, 0, 0);
return execl(_PATH_BSHELL, _PATH_BSHELL, NULL);
}
dev = tty_canonicalize(tty->dev);
if (!dev) {
_d("%s: Cannot find TTY device: %s", tty->dev, strerror(errno));
@@ -243,39 +258,27 @@ int tty_exec(svc_t *tty)
/*
* Fallback shell if no TTYs are active
*/
int tty_fallback(pid_t lost)
int tty_fallback(char *file)
{
#ifdef FALLBACK_SHELL
if (lost == 1) {
if (fallback) {
kill(fallback, SIGKILL);
fallback = 0;
}
svc_t *svc, *iter = NULL;
size_t num = 0;
return 0;
for (svc = svc_iterator(&iter, 1); svc; svc = svc_iterator(&iter, 0)) {
if (!svc_is_tty(svc) || svc_is_removed(svc))
continue;
num++;
}
if (fallback != lost || tty_num_active())
return 0;
#ifdef FALLBACK_SHELL
char line[32] = "tty [12345789] notty noclear";
fallback = fork();
if (fallback)
return 1;
if (!num) {
_d("No TTY active in configuration, enabling fallback shell.");
return service_register(SVC_TYPE_TTY, line, global_rlimit, file);
}
#endif
/*
* Become session leader and set controlling TTY
* to enable Ctrl-C and job control in shell.
*/
setsid();
ioctl(STDIN_FILENO, TIOCSCTTY, 1);
prctl(PR_SET_NAME, "finitsh", 0, 0, 0);
_exit(execl(_PATH_BSHELL, _PATH_BSHELL, NULL));
#else
(void)lost;
#endif /* FALLBACK_SHELL */
return 0;
return num == 0;
}
/**