Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip-user: multipath partition fix / dmcrypt activation fix #5740

Merged
merged 2 commits into from Sep 1, 2015
Merged

wip-user: multipath partition fix / dmcrypt activation fix #5740

merged 2 commits into from Sep 1, 2015

Conversation

ghost
Copy link

@ghost ghost commented Sep 1, 2015

contribution to #5727

2943194 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
@ghost ghost changed the title DNM: wip user wip-user: multipath partition fix / dmcrypt activation fix Sep 1, 2015
@ghost ghost assigned liewegas Sep 1, 2015
The multipath sanity checks of get_journal_osd_uuid must not try to
verify the partition type when the device is not a partition.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
liewegas added a commit that referenced this pull request Sep 1, 2015
wip-user: multipath partition fix / dmcrypt activation fix

Reviewed-by: Sage Weil <sage@redhat.com>
@liewegas liewegas merged commit bc232a4 into ceph:wip-user Sep 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants