storage/lvm: clean -snap LV on volume removal

2017-12-14 21:57:59 +01:00 · 2017-12-14 21:57:59 +01:00 · 96bd734852
commit 96bd734852
parent 466bf89aae
1 changed files with 6 additions and 3 deletions
--- a/qubes/storage/lvm.py
+++ b/qubes/storage/lvm.py
@ -323,9 +323,12 @@ class ThinVolume(qubes.storage.Volume):

    def remove(self):
        assert self.vid
-        if self.is_dirty():
-            cmd = ['remove', self._vid_snap]
-            qubes_lvm(cmd, self.log)
+        try:
+            if os.path.exists('/dev/' + self._vid_snap):
+                cmd = ['remove', self._vid_snap]
+                qubes_lvm(cmd, self.log)
+        except AttributeError:
+            pass

        self._remove_revisions(self.revisions.keys())
        if not os.path.exists(self.path):