Sync ubus familly tools.

This commit is contained in:
2017-04-08 21:34:59 +02:00
parent 0e9f199c9c
commit 63d0813f93
57 changed files with 413 additions and 564 deletions

View File

@@ -25,7 +25,6 @@
#include <libgen.h>
#include <sched.h>
#include <linux/limits.h>
#include <signal.h>
#include "capabilities.h"
#include "elf.h"
@@ -299,19 +298,12 @@ static void jail_process_timeout_cb(struct uloop_timeout *t)
kill(jail_process.pid, SIGKILL);
}
static void jail_handle_signal(int signo)
{
DEBUG("forwarding signal %d to the jailed process\n", signo);
kill(jail_process.pid, signo);
}
int main(int argc, char **argv)
{
sigset_t sigmask;
uid_t uid = getuid();
char log[] = "/dev/log";
char ubus[] = "/var/run/ubus.sock";
int ch, i;
int ch;
if (uid) {
ERROR("not root, aborting: %s\n", strerror(errno));
@@ -405,20 +397,6 @@ int main(int argc, char **argv)
prctl(PR_SET_NAME, opts.name, NULL, NULL, NULL);
uloop_init();
sigfillset(&sigmask);
for (i = 0; i < _NSIG; i++) {
struct sigaction s = { 0 };
if (!sigismember(&sigmask, i))
continue;
if ((i == SIGCHLD) || (i == SIGPIPE))
continue;
s.sa_handler = jail_handle_signal;
sigaction(i, &s, NULL);
}
if (opts.namespace) {
add_mount("/dev/full", 0, -1);
add_mount("/dev/null", 0, -1);