StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1952 from ogayot/zzzz-remove 

Ensure the zzzz-temp-installer-unattended-upgrade file does not end up on the target system
This commit is contained in:
Olivier Gayot 2024-03-26 10:07:19 +01:00 committed by GitHub
parent ce0683adec 2d8a1ea9b3
commit cdb56a0d9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
subiquity/server/controllers/install.py
View File

@ -751,10 +751,9 @@ class InstallController(SubiquityController):
apt_conf_contents += uu_apt_conf_update_all apt_conf_contents += uu_apt_conf_update_all
else: else:
apt_conf_contents += uu_apt_conf_update_security apt_conf_contents += uu_apt_conf_update_security
fname = "zzzz-temp-installer-unattended-upgrade" apt_conf_path = Path(aptdir) / "zzzz-temp-installer-unattended-upgrade"
with open(os.path.join(aptdir, fname), "wb") as apt_conf: apt_conf_path.write_bytes(apt_conf_contents)
apt_conf.write(apt_conf_contents) try:
apt_conf.close()
self.unattended_upgrades_ctx = context self.unattended_upgrades_ctx = context
self.unattended_upgrades_cmd = await start_curtin_command( self.unattended_upgrades_cmd = await start_curtin_command(
self.app, self.app,
@ -772,6 +771,8 @@ class InstallController(SubiquityController):
except subprocess.CalledProcessError as cpe: except subprocess.CalledProcessError as cpe:
log_process_streams(logging.ERROR, cpe, "Unattended upgrades") log_process_streams(logging.ERROR, cpe, "Unattended upgrades")
context.description = f"FAILED to apply {policy} updates" context.description = f"FAILED to apply {policy} updates"
finally:
apt_conf_path.unlink()
self.unattended_upgrades_cmd = None self.unattended_upgrades_cmd = None
self.unattended_upgrades_ctx = None self.unattended_upgrades_ctx = None