Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix restoring machine-id on reboot #1531

Merged
merged 2 commits into from
Jun 21, 2023
Merged

Conversation

Itxaka
Copy link
Member

@Itxaka Itxaka commented Jun 20, 2023

Was missing a check for openrc on the restoring machine-id so it was restored twice and the second was picking up a new machine-id generated by dbus

This worked on openrc systems as the paths to save and restore were correct and the save overwrote the generation but on systemd it was a newly generated machine-id that we are not saving thus it never matched.

Alos drops a duplicated metadata call

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Was missing a check for openrc on the restoring machine-id so it was restored
twice and the second was picking up a new machine-id generated by dbus

This worked on openrc systems as the paths to save and restore were
correct and the save overwrote the generation but on systemd it was a
newly generated machine-id that we are not saving thus it never matched.

Alos drops a duplicated metadata call

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
@Itxaka Itxaka requested a review from a team June 20, 2023 15:24
mauromorales
mauromorales previously approved these changes Jun 21, 2023
Copy link
Member

@mauromorales mauromorales left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>
@Itxaka Itxaka merged commit 2ab366b into kairos-io:master Jun 21, 2023
Itxaka added a commit to Itxaka/kairos that referenced this pull request Jun 21, 2023
mauromorales pushed a commit that referenced this pull request Jun 21, 2023
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants