vm/qubesvm: fix handling empty kernel value

Do not fail on empty kernel value - which means "use booloader on root.img". Fixes 3ddc052 "vm: move kernel presence validation to event handler"
QubesOS · Jun 25, 2017 · a6c16d0 · a6c16d0
1 parent 2601312
commit a6c16d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/qubes/tests/vm/qubesvm.py b/qubes/tests/vm/qubesvm.py
@@ -360,6 +360,11 @@ def test_251_kernel_invalid(self):
         self.assertPropertyInvalidValue(vm, 'kernel', 123)
         self.assertPropertyInvalidValue(vm, 'kernel', 'invalid')
 
+    def test_252_kernel_empty(self):
+        vm = self.get_vm()
+        self.assertPropertyValue(vm, 'kernel', '', '', '')
+        self.assertPropertyValue(vm, 'kernel', None, '', '')
+
     def test_260_kernelopts(self):
         vm = self.get_vm()
         self.assertPropertyDefaultValue(vm, 'kernelopts',

diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
@@ -755,6 +755,8 @@ def on_property_pre_set_name(self, event, name, newvalue, oldvalue=None):
     @qubes.events.handler('property-pre-set:kernel')
     def on_property_pre_set_kernel(self, event, name, newvalue, oldvalue=None):
         # pylint: disable=unused-argument
+        if not newvalue:
+            return
         dirname = os.path.join(
             qubes.config.system_path['qubes_base_dir'],
             qubes.config.system_path['qubes_kernels_base_dir'],