From 43ef6286ef24c80855e166f26d3ec72f606e8d20 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Tue, 7 Apr 2020 10:44:39 +1200
Subject: [PATCH 1/2] copy /run/casper-md5check.json to /var/log/installer

---
 subiquity/models/subiquity.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index 87c1772e..776082fc 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -16,6 +16,7 @@
 import asyncio
 import copy
 from collections import OrderedDict
+import json
 import logging
 import os
 import sys
@@ -224,6 +225,13 @@ class SubiquityModel:
         else:
             return "media-info"
 
+    def _casper_md5check(self):
+        if os.path.exists('/run/casper-md5check.json'):
+            with open('/run/casper-md5check.json') as fp:
+                return fp.read()
+        else:
+            return json.dumps({'result': 'skip'})
+
     def _machine_id(self):
         with open('/etc/machine-id') as fp:
             return fp.read()
@@ -286,6 +294,11 @@ class SubiquityModel:
                     'content': self._media_info(),
                     'permissions': 0o644,
                     },
+                'md5check': {
+                    'path': 'var/log/installer/casper-md5check.json',
+                    'content': self._casper_md5check(),
+                    'permissions': 0o644,
+                    },
                 },
             }
 

From 692011d84ea7f9604bbf465716070adf33335677 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Tue, 7 Apr 2020 11:38:51 +1200
Subject: [PATCH 2/2] only write the file if it exists

---
 subiquity/models/subiquity.py | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py
index 776082fc..f8f3bf17 100644
--- a/subiquity/models/subiquity.py
+++ b/subiquity/models/subiquity.py
@@ -16,7 +16,6 @@
 import asyncio
 import copy
 from collections import OrderedDict
-import json
 import logging
 import os
 import sys
@@ -225,13 +224,6 @@ class SubiquityModel:
         else:
             return "media-info"
 
-    def _casper_md5check(self):
-        if os.path.exists('/run/casper-md5check.json'):
-            with open('/run/casper-md5check.json') as fp:
-                return fp.read()
-        else:
-            return json.dumps({'result': 'skip'})
-
     def _machine_id(self):
         with open('/etc/machine-id') as fp:
             return fp.read()
@@ -294,14 +286,17 @@ class SubiquityModel:
                     'content': self._media_info(),
                     'permissions': 0o644,
                     },
-                'md5check': {
-                    'path': 'var/log/installer/casper-md5check.json',
-                    'content': self._casper_md5check(),
-                    'permissions': 0o644,
-                    },
                 },
             }
 
+        if os.path.exists('/run/casper-md5check.json'):
+            with open('/run/casper-md5check.json') as fp:
+                config['write_files']['md5check'] = {
+                    'path': 'var/log/installer/casper-md5check.json',
+                    'content': fp.read(),
+                    'permissions': 0o644,
+                    }
+
         for model_name in INSTALL_MODEL_NAMES:
             model = getattr(self, model_name)
             log.debug("merging config from %s", model)