diff options
| author | Chad Smith <chad.smith@canonical.com> | 2022-11-10 12:58:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 13:58:07 -0600 |
| commit | e0076e0d2e993ac8b7297ddc99e0187eb74cf152 (patch) | |
| tree | f33d809cda7a859a9df7319490ffdaec5d96007c | |
| parent | 7f045647ceae58f3fb69b1f31cab4ac322f62501 (diff) | |
| download | cloud-init-git-e0076e0d2e993ac8b7297ddc99e0187eb74cf152.tar.gz | |
apport: address new curtin log and config locations (#1812)
Retain legacy curtin log and config paths for Bionic, Focal, Jammy.
| -rwxr-xr-x | cloudinit/cmd/devel/logs.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/cloudinit/cmd/devel/logs.py b/cloudinit/cmd/devel/logs.py index 1c944a0f..9c4b6dcd 100755 --- a/cloudinit/cmd/devel/logs.py +++ b/cloudinit/cmd/devel/logs.py @@ -46,10 +46,30 @@ INSTALLER_APPORT_FILES = [ "/var/log/installer/subiquity-client-debug.log", "SubiquityClientDebug" ), ApportFile("/var/log/installer/curtin-install.log", "CurtinLog"), + # Legacy single curtin config < 22.1 ApportFile( - "/var/log/installer/subiquity-curtin-install.cfg", "CurtinConfig" + "/var/log/installer/subiquity-curtin-install.conf", + "CurtinInstallConfig", ), + ApportFile( + "/var/log/installer/curtin-install/subiquity-initial.conf", + "CurtinConfigInitial", + ), + ApportFile( + "/var/log/installer/curtin-install/subiquity-curthooks.conf", + "CurtinConfigCurtHooks", + ), + ApportFile( + "/var/log/installer/curtin-install/subiquity-extract.conf", + "CurtinConfigExtract", + ), + ApportFile( + "/var/log/installer/curtin-install/subiquity-partitioning.conf", + "CurtinConfigPartitioning", + ), + # Legacy curtin < 22.1 curtin error tar path ApportFile("/var/log/installer/curtin-error-logs.tar", "CurtinError"), + ApportFile("/var/log/installer/curtin-errors.tar", "CurtinError"), ApportFile("/var/log/installer/block/probe-data.json", "ProbeData"), ] |