Linaro Image Tools

Merge lp://staging/~emanuele-aina/linaro-image-tools/grub-load-rootfs-by-uuid into lp://staging/linaro-image-tools/11.11

grub-load-rootfs-by-uuid
Merge into trunk

Proposed by Emanuele Aina on 2012-07-05

Status:

Needs review

Proposed branch:

lp://staging/~emanuele-aina/linaro-image-tools/grub-load-rootfs-by-uuid

Merge into:

lp://staging/linaro-image-tools/11.11

Diff against target:

171 lines (+20/-19)

2 files modified

linaro_image_tools/media_create/boards.py (+18/-18)
linaro_image_tools/media_create/tests/test_media_create.py (+2/-1)

To merge this branch:

bzr merge lp://staging/~emanuele-aina/linaro-image-tools/grub-load-rootfs-by-uuid

Low

Won't Fix

Link a bug report

Reviewer	Review Type	Date Requested	Status
Milo Casagrande (community)		2012-07-05	Needs Fixing on 2012-10-18
Review via email: mp+113585@code.staging.launchpad.net

Description of the change

Currently the I386Config board definition sets the `root=LABEL=rootfs' parameter for the kernel to be booted and, given that populate_rootfs() uses the UUID to populate /etc/fstab, this can lead to some inconsistencies.

This branch updates the _make_boot_files_*() functions to accept a 'rootfs_uuid' parameter and on i386 uses it to generate a "root=UUID=%s" kernel command line argument.

Argument passing between the bootfs/rootfs stages is a bit flaky, given the need to update so many call sites. Coalescing all the function parameters in a BuildConfig object would reduce the patch to three lines and make future modifications easier.

Revision history for this message

Milo Casagrande (milo) wrote on 2012-10-18:

Hi Emanuele,

thanks for working on this!
I was looking at the patch, and unfortunately there is a small conflict when I merge it with trunk. Conflict is rather trivia to fix, but the are at least 13 tests failing now.

Can you please update the patch and take a look at the errors?
Thanks.

review: Needs Fixing