]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
ceph-disk: fix dmcrypt_map() usage for LUKS activate
authorDavid Disseldorp <ddiss@suse.de>
Sun, 9 Aug 2015 15:52:32 +0000 (17:52 +0200)
committerSage Weil <sage@redhat.com>
Tue, 1 Sep 2015 15:33:34 +0000 (11:33 -0400)
commitfcae1458bfbb724772b604dc01b53758ec38d671
treea3490a0b4b18fa429a8b11bf7591e81b794fac30
parentc14c3172bb5f68396c594a526ff93ab889c82f52
ceph-disk: fix dmcrypt_map() usage for LUKS activate

29431944c77adbc3464a8faeb7e052b24f821780 added a call to dmcrypt_map()
during disk activation. The change is not suitable for use alongside
the recently added dmcrypt LUKS support, because:
- The callers don't correctly provide cryptsetup_parameters or luks
  arguments.
- dmcrypt_map() calls LuksFormat, which should never be performed
  during disk activation.
- The key file paths don't carry the luks suffix when required.

This commit addresses these issues. Corresponding tests and a udev file
update will follow.

Signed-off-by: David Disseldorp <ddiss@suse.de>
Conflicts:
src/ceph-disk
src/ceph-disk