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

storage/kernel: skip modules.img block device if kernel dir doesn't have it

Browse Source 
Some kernels (like pvgrub2) may not provide modules.img and it isn't an
error. Don't break VM startup in that case, skip that device instead.

Fixes QubesOS/qubes-issues#3563
This commit is contained in:
Marek Marczykowski-Górecki 2018-02-26 22:18:44 +01:00
parent ba5d19e1b4
commit 1774be1c69
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qubes/storage/kernels.py
View File

@ -105,10 +105,6 @@ class LinuxModules(Volume):
return False return False
def start(self): def start(self):
path = self.path
if path and not os.path.exists(path):
raise StoragePoolException('Missing kernel modules: %s' % path)
return self return self
def stop(self): def stop(self):
@ -116,12 +112,15 @@ class LinuxModules(Volume):
def verify(self): def verify(self):
if self.vid: if self.vid:
_check_path(self.path)
_check_path(self.vmlinuz) _check_path(self.vmlinuz)
_check_path(self.initramfs) _check_path(self.initramfs)
def block_device(self): def block_device(self):
if self.vid: path = self.path
# create block device for modules.img only if:
# - there is kernel set for the VM
# - that kernel directory contains modules.img file
if path and os.path.exists(path):
return super().block_device() return super().block_device()
return None return None

2
qubes/tests/storage_kernels.py
View File

@ -75,6 +75,8 @@ class TC_01_KernelVolumes(qubes.tests.QubesTestCase):
self.app = TestApp() self.app = TestApp()
self.app.create_dummy_template() self.app.create_dummy_template()
self.app.add_pool(**self.POOL_CONF) self.app.add_pool(**self.POOL_CONF)
os.makedirs(self.POOL_DIR + '/dummy', exist_ok=True)
open('/tmp/test-pool/dummy/modules.img', 'w').close()
def tearDown(self): def tearDown(self):
""" Remove the file based storage pool after testing """ """ Remove the file based storage pool after testing """