mirror of
https://github.com/troglobit/finit.git
synced 2026-10-21 11:29:42 +00:00
Refactor run_getty() and run_getty2() into one
By moving the built-in getty to a stand-alone bundled getty we can now refactor the old run_getty() functions into a single one. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
a319e32438
commit
5404aa6037
5 files changed
+11
-43
No files matched your search
+1
-29
@@ -345,35 +345,7 @@ static int activate_console(int noclear, int nowait)
|
||||
* since /bin/login usually only disables ECHO until a password line has
|
||||
* been entered. Upon starting the user's $SHELL the ISIG flag is reset
|
||||
*/
|
||||
pid_t run_getty(char *tty, char *baud, char *term, int noclear, int nowait, struct rlimit rlimit[])
|
||||
{
|
||||
speed_t speed;
|
||||
int rc = 1;
|
||||
|
||||
speed = stty_parse_speed(baud);
|
||||
prepare_tty(tty, speed, "tty", rlimit);
|
||||
if (activate_console(noclear, nowait)) {
|
||||
char spd[15];
|
||||
char *args[5] = {
|
||||
"getty",
|
||||
tty,
|
||||
spd,
|
||||
term,
|
||||
NULL
|
||||
};
|
||||
snprintf(spd, sizeof(spd), "%d", speed);
|
||||
logit(LOG_ERR, "Starting built-in getty on %s, speed %u", tty, speed);
|
||||
rc = execv("/libexec/finit/getty", args);
|
||||
}
|
||||
logit(LOG_ERR, "Failed starting built-in getty on %s, speed %u", tty, speed);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
/*
|
||||
* 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_getty(char *tty, char *cmd, char *args[], int noclear, int nowait, struct rlimit rlimit[])
|
||||
{
|
||||
int rc = 1;
|
||||
|
||||
|
||||
Reference in new issue
Block a user