Merge lp://qastaging/~mvo/snappy/snappy-fix-bbb-crash into lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github

Proposed by Michael Vogt
Status: Work in progress
Proposed branch: lp://qastaging/~mvo/snappy/snappy-fix-bbb-crash
Merge into: lp://qastaging/~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 278 lines (+54/-58)
5 files modified
partition/bootloader.go (+15/-2)
partition/bootloader_grub.go (+1/-1)
partition/bootloader_grub_test.go (+14/-29)
partition/bootloader_uboot.go (+7/-10)
partition/bootloader_uboot_test.go (+17/-16)
To merge this branch: bzr merge lp://qastaging/~mvo/snappy/snappy-fix-bbb-crash
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+263530@code.qastaging.launchpad.net

Description of the change

Fix crash on the BBB when it tries to call BootloaderDir.

I'm not overly happy with the fix it would be better to have a single
bootloader dir. I hope we get there eventually.

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

please wait for this one, I want to land update-grub today and not deal with another merge

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

it also fixes this issue in some way

Unmerged revisions

547. By Michael Vogt

only set currentBootPath, otherBootPath if we have that

546. By Michael Vogt

no mountinfo anymore in the tests

545. By Michael Vogt

decouple partition/bootloader further

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches