Add obsolete message for non-exclusive switch.

git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@144 36d66b0a-2a48-0410-832c-cd162a569da5

diff --git a/man/cryptsetup.8 b/man/cryptsetup.8
index c2772e7..154c881 100644 (file)
--- a/man/cryptsetup.8
+++ b/man/cryptsetup.8
@@ -246,7 +246,11 @@ functionality, see dmsetup reload.
 identical to luksKillSlot, but deprecated action name. This option was
 renamed, as we introduced luksRemoveKey, a softer method for disabling
 password slots. To make a clear distinction that luksDelKey was more brutal than luksRemoveKey
-
+.PP
+\fI\-\-non-exclusive\fR
+.IP
+This option is ignored. Non-exclusive access to the same block device
+can cause data corruption thus this mode is no longer supported by cryptsetup.
 
 .SH "REPORTING BUGS"
 Report bugs to <dm-crypt@saout.de>.

diff --git a/src/cryptsetup.c b/src/cryptsetup.c
index 46f0ddb..b2918c7 100644 (file)
--- a/src/cryptsetup.c
+++ b/src/cryptsetup.c
@@ -708,13 +708,13 @@ int main(int argc, char **argv)
                { "skip",              'p',  POPT_ARG_STRING,                             &popt_tmp,              3, N_("How many sectors of the encrypted data to skip at the beginning"), N_("SECTORS") },
                { "readonly",          'r',  POPT_ARG_NONE,                               &opt_readonly,          0, N_("Create a readonly mapping"),                                       NULL },
                { "iter-time",         'i',  POPT_ARG_INT,                                &opt_iteration_time,    0, N_("PBKDF2 iteration time for LUKS (in ms)"),
-                 N_("msecs") },
+               N_("msecs") },
                { "batch-mode",        'q',  POPT_ARG_NONE,                               &opt_batch_mode,        0, N_("Do not ask for confirmation"),                                     NULL },
-               { "version",        '\0',  POPT_ARG_NONE,                                 &opt_version_mode,        0, N_("Print package version"),                                     NULL },
+               { "version",           '\0',  POPT_ARG_NONE,                              &opt_version_mode,      0, N_("Print package version"),                                     NULL },
                { "timeout",           't',  POPT_ARG_INT,                                &opt_timeout,           0, N_("Timeout for interactive passphrase prompt (in seconds)"),          N_("secs") },
                { "tries",             'T',  POPT_ARG_INT,                                &opt_tries,             0, N_("How often the input of the passphrase canbe retried"),            NULL },
                { "align-payload",     '\0',  POPT_ARG_INT,                               &opt_align_payload,     0, N_("Align payload at <n> sector boundaries - for luksFormat"),         N_("SECTORS") },
-               { "non-exclusive",     '\0',  POPT_ARG_NONE,                              &opt_non_exclusive,     0, N_("Allows non-exclusive access for luksOpen, WARNING see manpage."),        NULL },
+               { "non-exclusive",     '\0',  POPT_ARG_NONE,                              &opt_non_exclusive,     0, N_("(Obsoleted, see man page.)"),        NULL },
                { "header-backup-file",'\0',  POPT_ARG_STRING,                            &opt_header_backup_file,0, N_("File with LUKS header and keyslots backup."),        NULL },
                POPT_TABLEEND
        };