Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add linux-kernel to defaults['pool_config']

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-04-01 16:43:59 +02:00
parent 62c81044c5
commit ef485ca32a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qubes/__init__.py
View File

@ -1400,6 +1400,7 @@ class Qubes(PropertyHolder):
7: Label(7, '0x75507b', 'purple'), 7: Label(7, '0x75507b', 'purple'),
8: Label(8, '0x000000', 'black'), 8: Label(8, '0x000000', 'black'),
} }
for name, config in qubes.config.defaults['pool_configs'].items(): for name, config in qubes.config.defaults['pool_configs'].items():
self.pools[name] = self._get_pool(**config) self.pools[name] = self._get_pool(**config)

12
qubes/config.py
View File

@ -28,6 +28,8 @@
# make a real /etc/qubes/master.conf or whatever # make a real /etc/qubes/master.conf or whatever
# #
import os.path
'''Constants which can be configured in one place''' '''Constants which can be configured in one place'''
qubes_base_dir = "/var/lib/qubes" qubes_base_dir = "/var/lib/qubes"
@ -83,9 +85,17 @@ defaults = {
'private_img_size': 2*1024*1024*1024, 'private_img_size': 2*1024*1024*1024,
'root_img_size': 10*1024*1024*1024, 'root_img_size': 10*1024*1024*1024,
'pool_config': {'dir_path': '/var/lib/qubes/', 'pool_configs': {
'default': {'dir_path': qubes_base_dir,
'driver': 'xen', 'driver': 'xen',
'name': 'default'}, 'name': 'default'},
'linux-kernel': {
'dir_path': os.path.join(qubes_base_dir,
system_path['qubes_kernels_base_dir']),
'driver': 'linux-kernel',
'name': 'linux-kernel'
}
},
# how long (in sec) to wait for VMs to shutdown, # how long (in sec) to wait for VMs to shutdown,
# before killing them (when used qvm-run with --wait option), # before killing them (when used qvm-run with --wait option),

2
qubes/tests/storage.py
View File

@ -74,7 +74,7 @@ class TC_00_Pool(SystemTestsMixin, QubesTestCase):
def test_001_all_pool_drivers(self): def test_001_all_pool_drivers(self):
""" The only predefined pool driver is xen """ """ The only predefined pool driver is xen """
self.assertEquals(["xen"], pool_drivers()) self.assertEquals(['linux-kernel', 'xen'], pool_drivers())
def test_002_get_pool_klass(self): def test_002_get_pool_klass(self):
""" Expect the default pool to be `XenPool` """ """ Expect the default pool to be `XenPool` """