This issue was not noticed during legacy restore because only subclouds
have boot options that can trigger a situation like this.
Normal stand-alone systems and system controllers do not appear to
suffer any issue.
TEST PLAN
PASS: AIO-DX subcloud backup and restore
* New backup will include /boot files
* No double reboot
* Non-default kernel boot args will be kept
* /proc/cmdline can be used to verify kernel boot args
PASS: AIO-DX subcloud backup and restore
* Remove new /boot files from backup
* Restore with modified backup
* Non-default kernel boot args will be lost
* No double reboot
* /proc/cmdline can be used to verify kernel boot args
PASS: No regression on unaffected AIO-DX system controller
Reviewed: https:/ /review. opendev. org/c/starlingx /ansible- playbooks/ +/917718 /opendev. org/starlingx/ ansible- playbooks/ commit/ e31a01f201451ad cf85b503fdfc862 38102edfe3
Committed: https:/
Submitter: "Zuul (22348)"
Branch: master
commit e31a01f201451ad cf85b503fdfc862 38102edfe3
Author: Joshua Kraitberg <email address hidden>
Date: Mon Apr 29 15:38:18 2024 -0400
fix: Restore boot config during legacy restore
Boot configs were not being restored. Causing a double reboot after
unlocking when puppet updated boot config.
This is identical in purpose to https:/ /review. opendev. org/c/starlingx /ansible- playbooks/ +/886007.
This issue was not noticed during legacy restore because only subclouds
have boot options that can trigger a situation like this.
Normal stand-alone systems and system controllers do not appear to
suffer any issue.
TEST PLAN
PASS: AIO-DX subcloud backup and restore
* New backup will include /boot files
* No double reboot
* Non-default kernel boot args will be kept
* /proc/cmdline can be used to verify kernel boot args
PASS: AIO-DX subcloud backup and restore
* Remove new /boot files from backup
* Restore with modified backup
* Non-default kernel boot args will be lost
* No double reboot
* /proc/cmdline can be used to verify kernel boot args
PASS: No regression on unaffected AIO-DX system controller
Close-Bug: 2064297 15d788488798223 ee6f2966e95
Change-Id: Ibf7ac5b4c0998b
Signed-off-by: Joshua Kraitberg <email address hidden>