Merge pull request #468 from mwhudson/lp-1825576

copy /cdrom/.disk/info to /var/log/installer/media-info
This commit is contained in:
Dimitri John Ledkov 2019-04-26 14:39:22 +01:00 committed by GitHub
commit 89415fd810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions

View File

@ -160,6 +160,13 @@ class SubiquityModel:
os.makedirs(os.path.dirname(path), exist_ok=True) os.makedirs(os.path.dirname(path), exist_ok=True)
write_file(path, content, mode, omode="w") write_file(path, content, mode, omode="w")
def _media_info(self):
if os.path.exists('/cdrom/.disk/info'):
with open('/cdrom/.disk/info') as fp:
return fp.read()
else:
return "media-info"
def render(self, syslog_identifier): def render(self, syslog_identifier):
config = { config = {
'apt': { 'apt': {
@ -227,6 +234,11 @@ class SubiquityModel:
'content': open('/etc/machine-id').read(), 'content': open('/etc/machine-id').read(),
'permissions': 0o444, 'permissions': 0o444,
}, },
'media_info': {
'path': 'var/log/installer/media-info',
'content': self._media_info(),
'permissions': 0o644,
},
}, },
} }