chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
40473a7
)
notify: add systemd-notify --booted
author
Lennart Poettering
<lennart@poettering.net>
Mon, 21 Jun 2010 17:20:21 +0000
(19:20 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Mon, 21 Jun 2010 17:20:21 +0000
(19:20 +0200)
src/notify.c
patch
|
blob
|
history
diff --git
a/src/notify.c
b/src/notify.c
index 864b7c278d795c7441f46ea6a585c1ee70fe527a..77978104a71cd9f8789927e8a757606791e14161 100644
(file)
--- a/
src/notify.c
+++ b/
src/notify.c
@@
-35,6
+35,7
@@
static bool arg_ready = false;
static pid_t arg_pid = 0;
static const char *arg_status = NULL;
static bool arg_ready = false;
static pid_t arg_pid = 0;
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"
" --ready Inform the init system about service start-up completion\n"
" --pid[=PID] Set main pid of daemon\n"
" -h --help Show this help\n"
" --ready Inform the init system about service start-up completion\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);
return 0;
program_invocation_short_name);
return 0;
@@
-54,7
+56,8
@@
static int parse_argv(int argc, char *argv[]) {
enum {
ARG_READY = 0x100,
ARG_PID,
enum {
ARG_READY = 0x100,
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 },
{ "pid", optional_argument, NULL, ARG_PID },
{ "status", required_argument, NULL, ARG_STATUS },
{ "ready", no_argument, NULL, ARG_READY },
{ "pid", optional_argument, NULL, ARG_PID },
{ "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;
break;
arg_status = optarg;
break;
+ case ARG_BOOTED:
+ arg_booted = true;
+ break;
+
case '?':
return -EINVAL;
case '?':
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)
our_env[i++] = (char*) "READY=1";
if (arg_ready)
our_env[i++] = (char*) "READY=1";