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 rauc hook to restore machine-id in new grub environment #3451

Merged
merged 1 commit into from
Jul 4, 2024

Conversation

claplace
Copy link
Contributor

Without a machine-id, the next boot will be considered as a first boot, and any external data disk will be disabled.

Fixes #3247.

Screenshot 2024-06-29 at 12 32 46

After installing my raucb update bundle and a reboot:

Jun 29 16:34:38 homeassistant kernel: Kernel command line: BOOT_IMAGE=(hd0,gpt4)/Image root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootwait zram.enabled=1 zram.num_devices=3 systemd.machine_id=6c631b4986cb426f9b7860df4ce10629 fsck.repair=yes console=ttyS0 console=tty0 rauc.slot=B

The machine-id has been conserved 👍

Copy link

@home-assistant home-assistant bot left a comment

Choose a reason for hiding this comment

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

Hi @claplace

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

@home-assistant
Copy link

Please take a look at the requested changes, and use the Ready for review button when you are done, thanks 👍

Learn more about our pull request process.

@home-assistant home-assistant bot marked this pull request as draft June 29, 2024 16:39
@claplace claplace marked this pull request as ready for review June 29, 2024 16:41
@claplace
Copy link
Contributor Author

I'd like to add the rel-x label, but I'm not sure I can do that myself.

Copy link
Member

@sairon sairon left a comment

Choose a reason for hiding this comment

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

Thanks for looking into this, you got it right. In fact, the same issue started to manifest in latest dev builds for OVA/x86 as a result of #3435. However, I'll prefer to do it differently - instead of amending the grubenv distributed in the update bundle, preserve it as whole - in the same way as we do with the *.txt files (which we use for persisting machine-id on non-grub platforms).

@home-assistant home-assistant bot marked this pull request as draft July 3, 2024 13:36
Without a machine-id, the next boot will be considered as a
first boot, and any external data disk will be disabled.

Fixes home-assistant#3247.
@claplace
Copy link
Contributor Author

claplace commented Jul 3, 2024

Hi @sairon, that works even better, thank you!

Screenshot 2024-07-03 at 19 30 05

@claplace claplace marked this pull request as ready for review July 3, 2024 23:32
@home-assistant home-assistant bot requested a review from sairon July 3, 2024 23:32
Copy link
Member

@sairon sairon left a comment

Choose a reason for hiding this comment

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

Looking good now, thank you!

@sairon sairon merged commit 33d8b53 into home-assistant:dev Jul 4, 2024
2 checks passed
@sairon sairon added the board/generic-aarch64 Generic aarch64 machine label Jul 4, 2024
@sairon
Copy link
Member

sairon commented Jul 4, 2024

Tagging with generic-aarch64 only, since x86/OVA targets were not affected until the patch that landed just recently only in dev.

@claplace claplace deleted the cyprien/machine-id branch August 14, 2024 21:34
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

external data disk gets disabled on HAOS update in UEFI (arm64) VM - machine_id found empty
2 participants