Linaro Image Tools

Merge lp:~mabac/linaro-image-tools/sfdisk-fix into lp:linaro-image-tools/11.11

  1. sfdisk-fix
  2. Merge into trunk
Proposed by Mattias Backman
Status: Work in progress
Proposed branch: lp:~mabac/linaro-image-tools/sfdisk-fix
Merge into: lp:linaro-image-tools/11.11
Diff against target: 20 lines (+0/-3)
1 file modified
linaro_image_tools/media_create/partitions.py (+0/-3)
To merge this branch: bzr merge lp:~mabac/linaro-image-tools/sfdisk-fix
Reviewer Review Type Date Requested Status
linaro-image-tools maintainers Pending
Review via email: mp+78397@code.launchpad.net

Description of the change

Hi,

This branch removed the -C option used with sfdisk to be able to test if this breaks anything. There are also function arguments and unit tests to update if we want to land this, so this is not intended to be merged.

I have tested with a Pandaboard which booted fine.

Thanks,

Mattias

To post a comment you must log in.

Unmerged revisions

444. By Mattias Backman

Don't use -C with sfdisk.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro_image_tools/media_create/partitions.py'
2--- linaro_image_tools/media_create/partitions.py 2011-07-28 01:24:21 +0000
3+++ linaro_image_tools/media_create/partitions.py 2011-10-06 12:38:24 +0000
4@@ -129,7 +129,6 @@
5 cylinders = None
6 if not media.is_block_device:
7 image_size_in_bytes = convert_size_to_bytes(image_size)
8- cylinders = image_size_in_bytes / CYLINDER_SIZE
9 proc = cmd_runner.run(
10 ['dd', 'of=%s' % media.path,
11 'bs=1', 'seek=%s' % image_size_in_bytes, 'count=0'],
12@@ -487,8 +486,6 @@
13 '-uS',
14 '-H', str(heads),
15 '-S', str(sectors)]
16- if cylinders is not None:
17- args.extend(['-C', str(cylinders)])
18 args.append(device)
19 proc = cmd_runner.run(
20 args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=stderr,

Subscribers

People subscribed via source and target branches