diff --git a/coriolis/providers/backup_writers.py b/coriolis/providers/backup_writers.py index 811ca3d8..357a2f9d 100644 --- a/coriolis/providers/backup_writers.py +++ b/coriolis/providers/backup_writers.py @@ -112,7 +112,10 @@ def _disable_lvm_metad_udev_rule(ssh): """ rule_paths = [ "/lib/udev/rules.d/69-lvm-metad.rules", - "/lib/udev/rules.d/69-dm-lvm.rules"] + "/lib/udev/rules.d/69-dm-lvm.rules", + "/lib/udev/rules.d/69-lvm.rules", + "/lib/udev/rules.d/56-lvm.rules", + ] for path in rule_paths: if utils.test_ssh_path(ssh, path): utils.exec_ssh_cmd(ssh, "sudo rm %s" % path, get_pty=True) diff --git a/coriolis/tests/providers/test_backup_writers.py b/coriolis/tests/providers/test_backup_writers.py index 7ac97c09..4492336a 100644 --- a/coriolis/tests/providers/test_backup_writers.py +++ b/coriolis/tests/providers/test_backup_writers.py @@ -49,21 +49,24 @@ def test__disable_lvm2_lvmetad(self, mock_exec_ssh_cmd, @mock.patch('coriolis.utils.exec_ssh_cmd') def test__disable_lvm_metad_udev_rule(self, mock_exec_ssh_cmd, mock_test_ssh_path): - rule_path = ["/lib/udev/rules.d/69-lvm-metad.rules", - "/lib/udev/rules.d/69-dm-lvm.rules"] + rule_paths = [ + "/lib/udev/rules.d/69-lvm-metad.rules", + "/lib/udev/rules.d/69-dm-lvm.rules", + "/lib/udev/rules.d/69-lvm.rules", + "/lib/udev/rules.d/56-lvm.rules", + ] mock_test_ssh_path.return_value = True backup_writers._disable_lvm_metad_udev_rule(self.mock_ssh) mock_test_ssh_path.assert_has_calls( - [mock.call(self.mock_ssh, rule_path[0]), - mock.call(self.mock_ssh, rule_path[1])]) + [mock.call(self.mock_ssh, rule_path) + for rule_path in rule_paths]) expected_calls = [ - mock.call(self.mock_ssh, 'sudo rm %s' % rule_path[0], - get_pty=True), - mock.call(self.mock_ssh, 'sudo rm %s' % rule_path[1], - get_pty=True)] + mock.call(self.mock_ssh, 'sudo rm %s' % rule_path, + get_pty=True) + for rule_path in rule_paths] mock_exec_ssh_cmd.assert_has_calls(expected_calls) def test__check_deserialize_key(self):