X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Freadahead-replay.c;h=3bea9295fc6795a2e4896388ba164424a9a94338;hp=cd89654f983d105e7731b9d2dd7ae4ec7a9ad7ba;hb=2b590e135f53a1bd3e771bdc555f7bf28c4cd232;hpb=c1b664d055276f47f152fe90d1dd765c384271bc diff --git a/src/readahead-replay.c b/src/readahead-replay.c index cd89654f9..3bea9295f 100644 --- a/src/readahead-replay.c +++ b/src/readahead-replay.c @@ -333,6 +333,7 @@ static int parse_argv(int argc, char *argv[]) { int main(int argc, char*argv[]) { int r; + const char *root; log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); log_parse_environment(); @@ -341,6 +342,8 @@ int main(int argc, char*argv[]) { if ((r = parse_argv(argc, argv)) <= 0) return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + root = optind < argc ? argv[optind] : "/"; + if (!enough_ram()) { log_info("Disabling readahead replay due to low memory."); return 0; @@ -357,7 +360,7 @@ int main(int argc, char*argv[]) { shared->replay = getpid(); __sync_synchronize(); - if (replay(optind < argc ? argv[optind] : "/") < 0) + if (replay(root) < 0) return 1; return 0;