Skip to content

Commit

Permalink
create "lvm" pool using rootfs pool instead of hardcoding qubes_dom0-…
Browse files Browse the repository at this point in the history
…pool00
  • Loading branch information
qubesuser committed Nov 10, 2017
1 parent f35c32d commit 7559bb9
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions qubes/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -1048,10 +1048,13 @@ def load_initial_values(self):
}
assert max(self.labels.keys()) == qubes.config.max_default_label

# check if the default LVM Thin pool qubes_dom0/pool00 exists
if os.path.exists('/dev/mapper/qubes_dom0-pool00-tpool'):
self.add_pool(volume_group='qubes_dom0', thin_pool='pool00',
name='lvm', driver='lvm_thin')
root_volume_group = RootThinPool.volume_group()
root_thin_pool = RootThinPool.thin_pool()

if root_thin_pool:
self.add_pool(
volume_group=root_volume_group, thin_pool=root_thin_pool,
name='lvm', driver='lvm_thin')
# pool based on /var/lib/qubes will be created here:
for name, config in qubes.config.defaults['pool_configs'].items():
self.pools[name] = self._get_pool(**config)
Expand Down

0 comments on commit 7559bb9

Please sign in to comment.