notify: add systemd-notify --booted

This commit is contained in:
Lennart Poettering 2010-06-21 19:20:21 +02:00
parent 40473a70cf
commit 96551bae61
1 changed files with 13 additions and 2 deletions

View File

@ -35,6 +35,7 @@
static bool arg_ready = false; static bool arg_ready = false;
static pid_t arg_pid = 0; static pid_t arg_pid = 0;
static const char *arg_status = NULL; static const char *arg_status = NULL;
static bool arg_booted = false;
static int help(void) { static int help(void) {
@ -43,7 +44,8 @@ static int help(void) {
" -h --help Show this help\n" " -h --help Show this help\n"
" --ready Inform the init system about service start-up completion\n" " --ready Inform the init system about service start-up completion\n"
" --pid[=PID] Set main pid of daemon\n" " --pid[=PID] Set main pid of daemon\n"
" --status=TEXT Set status text\n", " --status=TEXT Set status text\n"
" --booted Returns 0 if the system was booted up with systemd, non-zero otherwise\n",
program_invocation_short_name); program_invocation_short_name);
return 0; return 0;
@ -54,7 +56,8 @@ static int parse_argv(int argc, char *argv[]) {
enum { enum {
ARG_READY = 0x100, ARG_READY = 0x100,
ARG_PID, ARG_PID,
ARG_STATUS ARG_STATUS,
ARG_BOOTED
}; };
static const struct option options[] = { static const struct option options[] = {
@ -62,6 +65,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "ready", no_argument, NULL, ARG_READY }, { "ready", no_argument, NULL, ARG_READY },
{ "pid", optional_argument, NULL, ARG_PID }, { "pid", optional_argument, NULL, ARG_PID },
{ "status", required_argument, NULL, ARG_STATUS }, { "status", required_argument, NULL, ARG_STATUS },
{ "booted", no_argument, NULL, ARG_BOOTED },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -98,6 +102,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_status = optarg; arg_status = optarg;
break; break;
case ARG_BOOTED:
arg_booted = true;
break;
case '?': case '?':
return -EINVAL; return -EINVAL;
@ -123,6 +131,9 @@ int main(int argc, char* argv[]) {
goto finish; goto finish;
} }
if (arg_booted)
return sd_booted() <= 0;
if (arg_ready) if (arg_ready)
our_env[i++] = (char*) "READY=1"; our_env[i++] = (char*) "READY=1";