X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnotify.c;h=943808eb0d68732aceaa989031313cd6a01af084;hp=28cfe23b23c4d81ddeaee10ba4b07366fc44abd9;hb=83cd6b754b270091840456a2c8a66dae19f5a7dc;hpb=22f4096ca96acd504ac74e7dfad96f07edb6da51

diff --git a/src/notify.c b/src/notify.c
index 28cfe23b2..943808eb0 100644
--- a/src/notify.c
+++ b/src/notify.c
@@ -27,25 +27,31 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <systemd/sd-daemon.h>
+
 #include "strv.h"
 #include "util.h"
 #include "log.h"
-#include "sd-daemon.h"
+#include "sd-readahead.h"
+#include "build.h"
 
 static bool arg_ready = false;
 static pid_t arg_pid = 0;
 static const char *arg_status = NULL;
 static bool arg_booted = false;
+static const char *arg_readahead = NULL;
 
 static int help(void) {
 
         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"
-               "     --booted       Returns 0 if the system was booted up with systemd, non-zero otherwise\n",
+               "  -h --help             Show this help\n"
+               "     --version          Show package version\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"
+               "     --booted           Returns 0 if the system was booted up with systemd, non-zero otherwise\n"
+               "     --readahead=ACTION Controls read-ahead operations\n",
                program_invocation_short_name);
 
         return 0;
@@ -55,18 +61,22 @@ static int parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_READY = 0x100,
+                ARG_VERSION,
                 ARG_PID,
                 ARG_STATUS,
-                ARG_BOOTED
+                ARG_BOOTED,
+                ARG_READAHEAD
         };
 
         static const struct option options[] = {
-                { "help",      no_argument,       NULL, 'h'         },
-                { "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           }
+                { "help",      no_argument,       NULL, 'h'           },
+                { "version",   no_argument,       NULL, ARG_VERSION   },
+                { "ready",     no_argument,       NULL, ARG_READY     },
+                { "pid",       optional_argument, NULL, ARG_PID       },
+                { "status",    required_argument, NULL, ARG_STATUS    },
+                { "booted",    no_argument,       NULL, ARG_BOOTED    },
+                { "readahead", required_argument, NULL, ARG_READAHEAD },
+                { NULL,        0,                 NULL, 0             }
         };
 
         int c;
@@ -82,6 +92,12 @@ static int parse_argv(int argc, char *argv[]) {
                         help();
                         return 0;
 
+                case ARG_VERSION:
+                        puts(PACKAGE_STRING);
+                        puts(DISTRIBUTION);
+                        puts(SYSTEMD_FEATURES);
+                        return 0;
+
                 case ARG_READY:
                         arg_ready = true;
                         break;
@@ -106,6 +122,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_booted = true;
                         break;
 
+                case ARG_READAHEAD:
+                        arg_readahead = optarg;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -119,7 +139,8 @@ static int parse_argv(int argc, char *argv[]) {
             !arg_ready &&
             !arg_status &&
             !arg_pid &&
-            !arg_booted) {
+            !arg_booted &&
+            !arg_readahead) {
                 help();
                 return -EINVAL;
         }
@@ -144,6 +165,13 @@ int main(int argc, char* argv[]) {
         if (arg_booted)
                 return sd_booted() <= 0;
 
+        if (arg_readahead) {
+                if ((r = sd_readahead(arg_readahead)) < 0) {
+                        log_error("Failed to issue read-ahead control command: %s", strerror(-r));
+                        goto finish;
+                }
+        }
+
         if (arg_ready)
                 our_env[i++] = (char*) "READY=1";