From 2499fa669d2322d1a77c2193765eec31dd132f6c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 2 Apr 2012 21:23:44 +0200 Subject: [PATCH] Allow to specify --align-payload only for luksFormat. --- ChangeLog | 1 + src/cryptsetup.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0b057698..7f4c89ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2012-03-16 Milan Broz * Add --keyfile-offset and --new-keyfile-offset parameters to API and CLI. * Add repair command and crypt_repair() for known LUKS metadata problems repair. + * Allow to specify --align-payload only for luksFormat. 2012-03-16 Milan Broz * Unify password verification option. diff --git a/src/cryptsetup.c b/src/cryptsetup.c index a56fb289..2730aa78 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -1443,6 +1443,7 @@ int main(int argc, const char **argv) if (opt_random && opt_urandom) usage(popt_context, EXIT_FAILURE, _("Only one of --use-[u]random options is allowed."), poptGetInvocationName(popt_context)); + if ((opt_random || opt_urandom) && strcmp(aname, "luksFormat")) usage(popt_context, EXIT_FAILURE, _("Option --use-[u]random is allowed only for luksFormat."), poptGetInvocationName(popt_context)); @@ -1451,6 +1452,10 @@ int main(int argc, const char **argv) usage(popt_context, EXIT_FAILURE, _("Option --uuid is allowed only for luksFormat and luksUUID."), poptGetInvocationName(popt_context)); + if (opt_align_payload && strcmp(aname, "luksFormat")) + usage(popt_context, EXIT_FAILURE, _("Option --align-payload is allowed only for luksFormat."), + poptGetInvocationName(popt_context)); + if (opt_skip && strcmp(aname, "create") && strcmp(aname, "loopaesOpen")) usage(popt_context, EXIT_FAILURE, _("Option --skip is supported only for create and loopaesOpen commands.\n"),