X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnotify%2Fnotify.c;h=a0f757a2523abde87f04e906092d621330ff45c5;hb=cb6518345fcc057ca6ed3d037253bb4eeab4d94e;hp=33933e4bf62ba4a50eb0bb9adbf0ac7302c61929;hpb=1acf16634912d8a35690fff9d7ad2bd0a91ce576;p=elogind.git

diff --git a/src/notify/notify.c b/src/notify/notify.c
index 33933e4bf..a0f757a25 100644
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -31,7 +31,6 @@
 #include "strv.h"
 #include "util.h"
 #include "log.h"
-#include "sd-readahead.h"
 #include "build.h"
 #include "env-util.h"
 
@@ -39,7 +38,6 @@ 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 void help(void) {
         printf("%s [OPTIONS...] [VARIABLE=VALUE...]\n\n"
@@ -49,8 +47,7 @@ static void help(void) {
                "     --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",
+               "     --booted           Returns 0 if the system was booted up with systemd, non-zero otherwise\n",
                program_invocation_short_name);
 }
 
@@ -62,7 +59,6 @@ static int parse_argv(int argc, char *argv[]) {
                 ARG_PID,
                 ARG_STATUS,
                 ARG_BOOTED,
-                ARG_READAHEAD
         };
 
         static const struct option options[] = {
@@ -72,7 +68,6 @@ static int parse_argv(int argc, char *argv[]) {
                 { "pid",       optional_argument, NULL, ARG_PID       },
                 { "status",    required_argument, NULL, ARG_STATUS    },
                 { "booted",    no_argument,       NULL, ARG_BOOTED    },
-                { "readahead", required_argument, NULL, ARG_READAHEAD },
                 {}
         };
 
@@ -118,10 +113,6 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_booted = true;
                         break;
 
-                case ARG_READAHEAD:
-                        arg_readahead = optarg;
-                        break;
-
                 case '?':
                         return -EINVAL;
 
@@ -134,8 +125,7 @@ static int parse_argv(int argc, char *argv[]) {
             !arg_ready &&
             !arg_status &&
             !arg_pid &&
-            !arg_booted &&
-            !arg_readahead) {
+            !arg_booted) {
                 help();
                 return -EINVAL;
         }
@@ -160,14 +150,6 @@ int main(int argc, char* argv[]) {
         if (arg_booted)
                 return sd_booted() <= 0;
 
-        if (arg_readahead) {
-                r = sd_readahead(arg_readahead);
-                if (r < 0) {
-                        log_error("Failed to issue read-ahead control command: %s", strerror(-r));
-                        goto finish;
-                }
-        }
-
         if (arg_ready)
                 our_env[i++] = (char*) "READY=1";