diff options
author | John Crispin <blogic@openwrt.org> | 2013-03-08 23:52:52 +0100 |
---|---|---|
committer | John Crispin <blogic@openwrt.org> | 2013-03-13 18:58:14 +0100 |
commit | 6390afe7a3cf1663979078711febb2be21fb4cf2 (patch) | |
tree | fb1b589607a2c5b2d41f72c15b21ed38600a0e1c /main.c | |
parent | 0f479be2068d7fe3bd5953e7454aaabb2be38d93 (diff) | |
download | unitd-6390afe7a3cf1663979078711febb2be21fb4cf2.tar unitd-6390afe7a3cf1663979078711febb2be21fb4cf2.zip |
add new main.c and fix Makefile/headers
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 48 |
1 files changed, 44 insertions, 4 deletions
@@ -1,11 +1,31 @@ +/* + * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2013 John Crispin <blogic@openwrt.org> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <sys/wait.h> +#include <sys/types.h> + +#include <unistd.h> #include <getopt.h> -#include "procd.h" +#include <libgen.h> -int debug = 0; +#include "procd.h" +#include "hotplug.h" +#include "watchdog.h" static int usage(const char *prog) { - fprintf(stderr, "Usage: %s [options]\n" + ERROR("Usage: %s [options]\n" "Options:\n" " -s <path>: Path to ubus socket\n" " -d: Enable debug messages\n" @@ -13,10 +33,26 @@ static int usage(const char *prog) return 1; } + +static int main_procd_init(int argc, char **argv) +{ + procd_early(); + debug_init(); + watchdog_init(); + uloop_init(); + hotplug("/etc/hotplug-preinit.json"); + procd_preinit(); + uloop_run(); + return 0; +} + int main(int argc, char **argv) { int ch; + if (!strcmp(basename(*argv), "init")) + return main_procd_init(argc, argv); + while ((ch = getopt(argc, argv, "ds:")) != -1) { switch (ch) { case 's': @@ -30,7 +66,11 @@ int main(int argc, char **argv) } } uloop_init(); - procd_connect_ubus(); + procd_signal(); + if (getpid() != 1) + procd_connect_ubus(); + else + procd_state_next(); uloop_run(); return 0; |