[systemd-commits] man/crypttab.xml src/cryptsetup

[Michal Schmidt]

 man/crypttab.xml            |    2 +-
 src/cryptsetup/cryptsetup.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 18cf1a1be5ae6985f211ec6f02504506da36b223
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Thu Jan 31 11:03:09 2013 +0100

    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

diff --git a/man/crypttab.xml b/man/crypttab.xml
index 2379fc0..f976bda 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 f332843..a8cdf10 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;