X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnotify.c;h=28cfe23b23c4d81ddeaee10ba4b07366fc44abd9;hb=490aed584944b684026a3fd01f8d81f2881e38d6;hp=864b7c278d795c7441f46ea6a585c1ee70fe527a;hpb=4a2a8b5a82325494f5daf4c66c23fdb4f906c9e6;p=elogind.git

diff --git a/src/notify.c b/src/notify.c
index 864b7c278..28cfe23b2 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
   This file is part of systemd.
@@ -35,15 +35,17 @@
 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) {
 
-        printf("%s [options] [VARIABLE=VALUE...]\n\n"
+        printf("%s [OPTIONS...] [VARIABLE=VALUE...]\n\n"
                "Notify the init system about service status updates.\n\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;
@@ -54,7 +56,8 @@ static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_READY = 0x100,
                 ARG_PID,
-                ARG_STATUS
+                ARG_STATUS,
+                ARG_BOOTED
         };
 
         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  },
+                { "booted",    no_argument,       NULL, ARG_BOOTED  },
                 { NULL,        0,                 NULL, 0           }
         };
 
@@ -98,6 +102,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_status = optarg;
                         break;
 
+                case ARG_BOOTED:
+                        arg_booted = true;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -107,6 +115,15 @@ static int parse_argv(int argc, char *argv[]) {
                 }
         }
 
+        if (optind >= argc &&
+            !arg_ready &&
+            !arg_status &&
+            !arg_pid &&
+            !arg_booted) {
+                help();
+                return -EINVAL;
+        }
+
         return 1;
 }
 
@@ -114,15 +131,19 @@ int main(int argc, char* argv[]) {
         char* our_env[4], **final_env = NULL;
         unsigned i = 0;
         char *status = NULL, *cpid = NULL, *n = NULL;
-        int r, retval = 1;
+        int r, retval = EXIT_FAILURE;
 
         log_parse_environment();
+        log_open();
 
         if ((r = parse_argv(argc, argv)) <= 0) {
-                retval = r < 0;
+                retval = r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
                 goto finish;
         }
 
+        if (arg_booted)
+                return sd_booted() <= 0;
+
         if (arg_ready)
                 our_env[i++] = (char*) "READY=1";
 
@@ -152,7 +173,7 @@ int main(int argc, char* argv[]) {
         }
 
         if (strv_length(final_env) <= 0) {
-                retval = 0;
+                retval = EXIT_SUCCESS;
                 goto finish;
         }
 
@@ -166,7 +187,7 @@ int main(int argc, char* argv[]) {
                 goto finish;
         }
 
-        retval = r <= 0;
+        retval = r <= 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
 finish:
         free(status);