Merge lp://qastaging/~dpigott/lava-master-image-scripts/move-partitioning-to-first-boot into lp://qastaging/lava-master-image-scripts

Proposed by Dave Pigott
Status: Merged
Approved by: Dave Pigott
Approved revision: 61
Merged at revision: 59
Proposed branch: lp://qastaging/~dpigott/lava-master-image-scripts/move-partitioning-to-first-boot
Merge into: lp://qastaging/lava-master-image-scripts
Diff against target: 469 lines (+211/-145)
8 files modified
NEWS (+2/-1)
README (+5/-22)
contrib/lava-partition-disk (+0/-118)
contrib/preEnv.txt (+0/-1)
lava-create-master (+12/-2)
master-rootfs-extras/bin/lava-partition-disk (+184/-0)
master-rootfs-extras/lib/lava/common (+1/-0)
master-rootfs-extras/lib/lava/lava-master-init (+7/-1)
To merge this branch: bzr merge lp://qastaging/~dpigott/lava-master-image-scripts/move-partitioning-to-first-boot
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle (community) Approve
Review via email: mp+105655@code.qastaging.launchpad.net

Description of the change

Get rid of the contrib, second stage code, and make it all happen on first boot. Re-write and tidy the partitioning code. Add a new option to lava-create-master-image to take in testrootfs size as a command line parameter.

Also put the image size back to 1GB. The 3GB was unnecessary, since we deploy onto testrootfs, which is usually 4G and in the LAVA farm is always 8GB.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

450 -LAVA_PKGS="wget dosfstools u-boot-tools bzip2 python ntpdate"
451 +LAVA_PKGS="wget dosfstools u-boot-tools bzip2 python ntpdate parted"

Do we need parted? We use fdisk, we also need partprobe and mkfs.ext4 (they may be already contained in other packages)

Otherwise it looks fine on first read +2

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

I tested this branch and it seems to work. Nice :)

review: Approve
Revision history for this message
Dave Pigott (dpigott) wrote :

> 450 -LAVA_PKGS="wget dosfstools u-boot-tools bzip2 python ntpdate"
> 451 +LAVA_PKGS="wget dosfstools u-boot-tools bzip2 python ntpdate parted"
>
> Do we need parted? We use fdisk, we also need partprobe and mkfs.ext4 (they
> may be already contained in other packages)
>
> Otherwise it looks fine on first read +2

It was purely because of partprobe. Wasn't aware of another package that contains it.

61. By Dave Pigott

Add a little more commentary

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