diff options
author | Lennart Poettering <lennart@poettering.net> | 2012-04-24 13:12:29 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-04-24 13:14:40 +0200 |
commit | 3b2d5b02ae231f1d3eb0d96eb980155d7797304e (patch) | |
tree | 0ba7982fdfc66ddfca030ca772b8d3286f7ea3c0 /src/readahead/readahead-replay.c | |
parent | 5273510e9f228a300ec6207d4502f1c6253aed5e (diff) |
readahead: rather than checking for virtualization in the C code, use ConditionVirtualization= in the unit
Diffstat (limited to 'src/readahead/readahead-replay.c')
-rw-r--r-- | src/readahead/readahead-replay.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/readahead/readahead-replay.c b/src/readahead/readahead-replay.c index 7c263f6e53..f91020e805 100644 --- a/src/readahead/readahead-replay.c +++ b/src/readahead/readahead-replay.c @@ -350,7 +350,8 @@ int main(int argc, char*argv[]) { umask(0022); - if ((r = parse_argv(argc, argv)) <= 0) + r = parse_argv(argc, argv); + if (r <= 0) return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; root = optind < argc ? argv[optind] : "/"; @@ -360,12 +361,8 @@ int main(int argc, char*argv[]) { return 0; } - if (detect_virtualization(NULL) > 0) { - log_info("Disabling readahead replay due to execution in virtualized environment."); - return 0; - } - - if (!(shared = shared_get())) + shared = shared_get(); + if (!shared) return 1; shared->replay = getpid(); |