lp:~smoser/curtin/trunk.lp1523779
- Get this branch:
- bzr branch lp:~smoser/curtin/trunk.lp1523779
Branch merges
- Server Team CI bot: Approve (continuous-integration)
- Ryan Harper (community): Approve
-
Diff: 137 lines (+51/-31)2 files modifiedcurtin/commands/block_meta.py (+19/-18)
curtin/commands/curthooks.py (+32/-13)
Related bugs
Bug #1523779: [1.9] grub-install error on power8 deployment | High | Fix Released |
Related blueprints
Branch information
Recent revisions
- 322. By Scott Moser
-
initial hack commit to fix
This makes my install succeed when provided with gpt and a prep partition.
partitioning_commands:
builtin: [curtin, block-meta, custom]
storage:
config:
- {id: sda, model: IPR-0 5EC29C00, name: sda, ptable: gpt, serial: IBM_IPR-0_5EC29C0000000 080, type: disk, wipe: superblock}
- {device: sda, grub_device: true, id: sda-part1, name: sda-part1, number: 1, flag: prep, offset: 4194304B, size: 8388608B, type: partition, wipe: zero}
- {device: sda, id: sda-part2, name: sda-part2, number: 2, offset: 12582912B, size: 283778220032B, type: partition, uuid: 6193de67-6b76-4cb6- bf6d-25518842d5 4b, wipe: superblock}
- devices: [sda-part2]
id: vgroot
name: vgroot
type: lvm_volgroup
uuid: 93d1991a-9631-4051- 81dd-c60d3267f2 3b
- {id: vgroot-lvroot, name: lvroot, size: 283774025728B, type: lvm_partition, volgroup: vgroot}
- {fstype: ext4, id: vgroot-lvroot_ format, label: root, type: format, uuid: efdcbb0b- b9ca-455f- 8cf9-1dbfc82071 7a, volume: vgroot-lvroot}
- {device: vgroot-lvroot_ format, id: vgroot- lvroot_ mount, path: /, type: mount}
version: 1 - 321. By Scott Moser
-
support passing an integer or valid float to human2bytes
We were forcing people to pass 'size' in a config as a string.
human2bytes("100") was fine but human2bytes(100) would raise exception.Seems to make sense for human2bytes to allow int (100) or float (100.0).
floats are allowed if int(size) == size (100.0 is ok, 100.4 is not). - 320. By Ryan Harper
-
Use /proc/mounts to find missing mountpoints
lsblk (notably on trusty) does not find all mountpoints. Augment
block.get_mountpoints( ) lsblk data with mountpoints from proc/mounts.
Refactor reading proc/mounts into common function in block for reuse.Fixes PreciseTestBasic (issues with btrfs on whole disk)
Fixes TrustyTestBasic (issues with dname and ptable) - 319. By Scott Moser
-
tests: invoke nosetests with --nologcapture
When a install or boot fails, the vmtest harness would log.DEBUG
with the console log output. nose was capturing this logging
and replaying it on test failure.This causes very long output to the screen of the user who ran
'make vmtest', making it hard for them to find out what happened.Since we're now reasonably storing the console logs, its quite
sane to not spit those to stderr so that the output is easier to read. - 318. By Scott Moser
-
vmtests: validate formatting/mounting of a disk without a partition table
Several use-cases involve formatting and entire disk with a filesystem.
Exercise this code by adding additional disks and tests to the test_basic
test. Utilize the btrfs filesystem type. Adding this test exposed several
issues with both fstab writing (it didn't know what to do with volumes of
type 'disk') and typo's in postinstall code which installed filesystem
utilities into the target (brtfs vs. btrfs). A couple other minor fixes
were included to ensure the testsuite
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~curtin-dev/curtin/trunk