projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
procd: Make askconsole work again when no tty is specified in inittab
[project/procd.git]
/
inittab.c
diff --git
a/inittab.c
b/inittab.c
index
2d9a1e0
..
be18482
100644
(file)
--- a/
inittab.c
+++ b/
inittab.c
@@
-37,7
+37,7
@@
#define MAX_ARGS 8
struct init_action;
#define MAX_ARGS 8
struct init_action;
-c
onst char *console
;
+c
har *console = NULL
;
struct init_handler {
const char *name;
struct init_handler {
const char *name;
@@
-64,10
+64,48
@@
static char *ask = "/sbin/askfirst";
static LIST_HEAD(actions);
static LIST_HEAD(actions);
+static int dev_open(const char *dev)
+{
+ int fd = -1;
+
+ if (dev) {
+ chdir("/dev");
+ fd = open( dev, O_RDWR);
+ chdir("/");
+ }
+
+ return fd;
+}
+
+static int dev_exist(const char *dev)
+{
+ int res;
+
+ res = dev_open(dev);
+ if (res != -1) {
+ close(res);
+ }
+
+ return (res != -1);
+}
+
static void fork_worker(struct init_action *a)
{
static void fork_worker(struct init_action *a)
{
+ int fd;
+ pid_t p;
+
a->proc.pid = fork();
if (!a->proc.pid) {
a->proc.pid = fork();
if (!a->proc.pid) {
+ p = setsid( );
+ fd = dev_open(a->id);
+ if (fd != -1)
+ {
+ dup2(fd, STDIN_FILENO);
+ dup2(fd, STDOUT_FILENO);
+ dup2(fd, STDERR_FILENO);
+ tcsetpgrp(fd, p);
+ close(fd);
+ }
execvp(a->argv[0], a->argv);
ERROR("Failed to execute %s\n", a->argv[0]);
exit(-1);
execvp(a->argv[0], a->argv);
ERROR("Failed to execute %s\n", a->argv[0]);
exit(-1);
@@
-111,22
+149,17
@@
static void runrc(struct init_action *a)
static void askfirst(struct init_action *a)
{
static void askfirst(struct init_action *a)
{
- struct stat s;
int i;
int i;
- chdir("/dev");
- i = stat(a->id, &s);
- chdir("/");
- if (i || (console && !strcmp(console, a->id))) {
+ if (!dev_exist(a->id) || (console && !strcmp(console, a->id))) {
DEBUG(4, "Skipping %s\n", a->id);
return;
}
a->tout.cb = respawn;
DEBUG(4, "Skipping %s\n", a->id);
return;
}
a->tout.cb = respawn;
- for (i = MAX_ARGS -
2; i >= 2
; i--)
- a->argv[i] = a->argv[i -
2
];
+ for (i = MAX_ARGS -
1; i >= 1
; i--)
+ a->argv[i] = a->argv[i -
1
];
a->argv[0] = ask;
a->argv[0] = ask;
- a->argv[1] = a->id;
a->respawn = 500;
a->proc.cb = child_exit;
a->respawn = 500;
a->proc.cb = child_exit;
@@
-135,29
+168,32
@@
static void askfirst(struct init_action *a)
static void askconsole(struct init_action *a)
{
static void askconsole(struct init_action *a)
{
- struct stat s;
char line[256], *tty, *split;
int i;
tty = get_cmdline_val("console", line, sizeof(line));
char line[256], *tty, *split;
int i;
tty = get_cmdline_val("console", line, sizeof(line));
- split=strchr(tty, ',');
- if (split != NULL)
- split = '\0';
-
- chdir("/dev");
- i = stat(tty, &s);
- chdir("/");
- if (i) {
- DEBUG(4, "skipping %s\n", tty);
- return;
+ if (tty != NULL) {
+ split = strchr(tty, ',');
+ if (split != NULL)
+ *split = '\0';
+
+ if (!dev_exist(tty)) {
+ DEBUG(4, "skipping %s\n", tty);
+ return;
+ }
+
+ console = strdup(tty);
+ a->id = strdup(tty);
+ }
+ else {
+ console = NULL;
+ a->id = NULL;
}
}
- console = strdup(tty);
a->tout.cb = respawn;
a->tout.cb = respawn;
- for (i = MAX_ARGS -
2; i >= 2
; i--)
- a->argv[i] = a->argv[i -
2
];
+ for (i = MAX_ARGS -
1; i >= 1
; i--)
+ a->argv[i] = a->argv[i -
1
];
a->argv[0] = ask;
a->argv[0] = ask;
- a->argv[1] = strdup(tty);
a->respawn = 500;
a->proc.cb = child_exit;
a->respawn = 500;
a->proc.cb = child_exit;