summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2013-01-31 11:03:09 +0100
committerMichal Schmidt <mschmidt@redhat.com>2013-01-31 19:57:56 +0100
commit18cf1a1be5ae6985f211ec6f02504506da36b223 (patch)
treec237ad09428695bac5cde9bb541436e90d5379bf
parent682cfdff697707dbe29c9c1907a7c8c452ffb397 (diff)
cryptsetup: accept both "read-only" and "readonly" spellings
Mukund Sivaraman pointed out that cryptsetup(5) mentions the "read-only" option, while the code understands "readonly". We could just fix the manpage, but for consistency in naming of multi-word options it would be prettier to have "read-only". So let's accept both spellings. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=903463
-rw-r--r--man/crypttab.xml2
-rw-r--r--src/cryptsetup/cryptsetup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/crypttab.xml b/man/crypttab.xml
index 2379fc0827..f976bdaa25 100644
--- a/man/crypttab.xml
+++ b/man/crypttab.xml
@@ -182,7 +182,7 @@
</varlistentry>
<varlistentry>
- <term><varname>read-only</varname></term>
+ <term><varname>read-only</varname></term><term><varname>readonly</varname></term>
<listitem><para>Set up the encrypted
block device in read-only
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index f33284370c..a8cdf10177 100644
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -111,7 +111,7 @@ static int parse_one_option(const char *option) {
return 0;
}
- } else if (streq(option, "readonly"))
+ } else if (streq(option, "readonly") || streq(option, "read-only"))
opt_readonly = true;
else if (streq(option, "verify"))
opt_verify = true;