vm: fix volume_config

- kernel volume shouldn't have snap_on_start, it's read-only volume anyway - root volume of AppVM should have placeholder for 'source' - private volume of AppVM should _not_ have placeholder for 'source' (it's ignored anyway, because snap_on_start=False) QubesOS/qubes-issues#2256
QubesOS · Jun 9, 2017 · 80b459b · 80b459b
1 parent fd5386c
commit 80b459b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/qubes/vm/appvm.py b/qubes/vm/appvm.py
@@ -48,6 +48,7 @@ class AppVM(qubes.vm.qubesvm.QubesVM):
                 'snap_on_start': True,
                 'save_on_stop': False,
                 'rw': False,
+                'source': None,
                 'internal': True
             },
             'private': {
@@ -56,7 +57,6 @@ class AppVM(qubes.vm.qubesvm.QubesVM):
                 'snap_on_start': False,
                 'save_on_stop': True,
                 'rw': True,
-                'source': None,
                 'size': defaults['private_img_size'],
                 'internal': True
             },
@@ -70,7 +70,6 @@ class AppVM(qubes.vm.qubesvm.QubesVM):
             'kernel': {
                 'name': 'kernel',
                 'pool': 'linux-kernel',
-                'snap_on_start': True,
                 'rw': False,
                 'internal': True
             }

diff --git a/qubes/vm/dispvm.py b/qubes/vm/dispvm.py
@@ -68,7 +68,6 @@ def __init__(self, *args, **kwargs):
             'kernel': {
                 'name': 'kernel',
                 'pool': 'linux-kernel',
-                'snap_on_start': True,
                 'rw': False,
                 'internal': True
             }

diff --git a/qubes/vm/templatevm.py b/qubes/vm/templatevm.py
@@ -94,7 +94,6 @@ def __init__(self, *args, **kwargs):
             'kernel': {
                 'name': 'kernel',
                 'pool': 'linux-kernel',
-                'snap_on_start': True,
                 'internal': True,
                 'rw': False
             }