storage/lvm: prefix VM LVM volumes with 'vm-'

This will allow filtering them out in udev rules - to not parse any of it. QubesOS/qubes-issues#2319
marmarek · Jun 9, 2017 · fd5386c · fd5386c
1 parent fd3f19d
commit fd5386c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/qubes/storage/lvm.py b/qubes/storage/lvm.py
@@ -134,7 +134,7 @@ def init_volume(self, vm, volume_config):
 
             assert self.name
 
-            volume_config['vid'] = "{!s}/{!s}-{!s}".format(
+            volume_config['vid'] = "{!s}/vm-{!s}-{!s}".format(
                 self.volume_group, vm_name, volume_config['name'])
 
         volume_config['volume_group'] = self.volume_group
@@ -180,7 +180,7 @@ def remove(self, volume):
 
     def rename(self, volume, old_name, new_name):
         ''' Called when the domain changes its name '''
-        new_vid = "{!s}/{!s}-{!s}".format(self.volume_group, new_name,
+        new_vid = "{!s}/vm-{!s}-{!s}".format(self.volume_group, new_name,
                                           volume.name)
         if volume.save_on_stop:
             cmd = ['clone', volume.vid, new_vid]