Skip to content

Commit

Permalink
Sync encrypteddisk table after successful volume import
Browse files Browse the repository at this point in the history
Conflicts:
	gui/storage/views.py
  • Loading branch information
william-gr committed Jun 14, 2013
1 parent 3bd004c commit c5281b7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions gui/storage/forms.py
Expand Up @@ -1858,6 +1858,7 @@ def done(self, volume):
else:
msg = _("Volume could not be imported")
raise MiddlewareError(msg)
notifier().sync_encrypted(volume=volume)

_notifier = notifier()
for svc in self.cleaned_data.get("services"):
Expand Down
1 change: 1 addition & 0 deletions gui/storage/views.py
Expand Up @@ -1043,6 +1043,7 @@ def volume_unlock(request, object_id):
zimport = notifier().zfs_import(volume.vol_name,
id=volume.vol_guid)
if zimport and volume.is_decrypted:
notifier().sync_encrypted(volume=volume)
return JsonResponse(
message=_("Volume unlocked")
)
Expand Down

0 comments on commit c5281b7

Please sign in to comment.