From 80b459b6d5bc930fe2f01b09c50b8d7b83a3ecbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Fri, 9 Jun 2017 04:44:22 +0200
Subject: [PATCH] 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
---
 qubes/vm/appvm.py      | 3 +--
 qubes/vm/dispvm.py     | 1 -
 qubes/vm/templatevm.py | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/qubes/vm/appvm.py b/qubes/vm/appvm.py
index 0fd0b88c..7d060149 100644
--- 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
index f83630ef..ff8e39d5 100644
--- a/qubes/vm/dispvm.py
+++ b/qubes/vm/dispvm.py
@@ -68,7 +68,6 @@ class DispVM(qubes.vm.qubesvm.QubesVM):
             '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
index 3461acd4..7be3e0a2 100644
--- a/qubes/vm/templatevm.py
+++ b/qubes/vm/templatevm.py
@@ -94,7 +94,6 @@ class TemplateVM(QubesVM):
             'kernel': {
                 'name': 'kernel',
                 'pool': 'linux-kernel',
-                'snap_on_start': True,
                 'internal': True,
                 'rw': False
             }