|
 |
7f93bc2 |
From 266b214a3cae3f6e43bc176614fdb4f5fd8332ea Mon Sep 17 00:00:00 2001
|
|
|
a59965a |
From: Alison Chaiken <alison_chaiken@mentor.com>
|
|
|
a59965a |
Date: Fri, 16 May 2014 09:25:53 +0200
|
|
|
a59965a |
Subject: [PATCH] man: readahead: fix cmdline switch inconsistency between
|
|
|
a59965a |
readahead.c and docs
|
|
|
a59965a |
|
|
|
a59965a |
Source code has "files-max" and XML has --max-files.
|
|
|
a59965a |
|
|
|
a59965a |
(cherry picked from commit 332bc31992acffc6f32e194c0122e01607bd0e27)
|
|
|
a59965a |
(cherry picked from commit 78db70d9c7da6ad48291047bad1ab2f4e80795e7)
|
|
|
a59965a |
|
|
|
a59965a |
Conflicts:
|
|
|
a59965a |
man/systemd-readahead-replay.service.xml
|
|
|
a59965a |
src/readahead/readahead.c
|
|
|
a59965a |
---
|
|
|
a59965a |
man/systemd-readahead-replay.service.xml | 2 +-
|
|
|
a59965a |
src/readahead/readahead.c | 2 +-
|
|
|
a59965a |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
a59965a |
|
|
|
a59965a |
diff --git a/man/systemd-readahead-replay.service.xml b/man/systemd-readahead-replay.service.xml
|
|
|
1cc3df3 |
index 806d46093b..8a1f47a947 100644
|
|
|
a59965a |
--- a/man/systemd-readahead-replay.service.xml
|
|
|
a59965a |
+++ b/man/systemd-readahead-replay.service.xml
|
|
|
a59965a |
@@ -124,7 +124,7 @@
|
|
|
a59965a |
</varlistentry>
|
|
|
a59965a |
|
|
|
a59965a |
<varlistentry>
|
|
|
a59965a |
- <term><option>--max-files=</option></term>
|
|
|
a59965a |
+ <term><option>--files-max=</option></term>
|
|
|
a59965a |
|
|
|
a59965a |
<listitem><para>Maximum number of
|
|
|
a59965a |
files to read ahead. Only valid
|
|
|
a59965a |
diff --git a/src/readahead/readahead.c b/src/readahead/readahead.c
|
|
|
1cc3df3 |
index 29255c9f07..78bf837851 100644
|
|
|
a59965a |
--- a/src/readahead/readahead.c
|
|
|
a59965a |
+++ b/src/readahead/readahead.c
|
|
|
a59965a |
@@ -40,7 +40,7 @@ static int help(void) {
|
|
|
a59965a |
printf("%s [OPTIONS...] collect [DIRECTORY]\n\n"
|
|
|
a59965a |
"Collect read-ahead data on early boot.\n\n"
|
|
|
a59965a |
" -h --help Show this help\n"
|
|
|
a59965a |
- " --max-files=INT Maximum number of files to read ahead\n"
|
|
|
a59965a |
+ " --files-max=INT Maximum number of files to read ahead\n"
|
|
|
a59965a |
" --file-size-max=BYTES Maximum size of files to read ahead\n"
|
|
|
a59965a |
" --timeout=USEC Maximum time to spend collecting data\n\n\n",
|
|
|
a59965a |
program_invocation_short_name);
|