X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnotify.c;h=514636e47208ae310d67b3c174a6406251f6bcd1;hp=864b7c278d795c7441f46ea6a585c1ee70fe527a;hb=2f02ce4005075ac76742ed6a2189cc2e5fc6a192;hpb=4a2a8b5a82325494f5daf4c66c23fdb4f906c9e6;ds=inline

diff --git a/src/notify.c b/src/notify.c
index 864b7c278..514636e47 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -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;
 }
 
@@ -123,6 +140,9 @@ int main(int argc, char* argv[]) {
                 goto finish;
         }
 
+        if (arg_booted)
+                return sd_booted() <= 0;
+
         if (arg_ready)
                 our_env[i++] = (char*) "READY=1";