Merge lp:~martin-ohlson/linaro-image-tools/disk-info-bug-673410 into lp:linaro-image-tools/11.11

Proposed by Martin Ohlsson
Status: Merged
Merged at revision: 168
Proposed branch: lp:~martin-ohlson/linaro-image-tools/disk-info-bug-673410
Merge into: lp:linaro-image-tools/11.11
Diff against target: 32 lines (+5/-5)
1 file modified
linaro-media-create (+5/-5)
To merge this branch: bzr merge lp:~martin-ohlson/linaro-image-tools/disk-info-bug-673410
Reviewer Review Type Date Requested Status
Guilherme Salgado (community) Approve
Review via email: mp+41139@code.launchpad.net

Description of the change

Replace "sfdisk -l" with "fdisk -l".

Bug #673410.

Use "fdisk -l" to list the partiton tables in a more user friendly manner.

I haven't been able to run the script for test/verification. I'm waiting on the IT department to install Ubuntu on my company computer. This branch is proposed for merging because it contains a very trivial fix.

Regards,
Martin

To post a comment you must log in.
Revision history for this message
Guilherme Salgado (salgado) wrote :

Hi Martin,

This looks good and seems to work as expected. Thanks!

 review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'linaro-media-create'
2--- linaro-media-create 2010-11-09 20:48:16 +0000
3+++ linaro-media-create 2010-11-18 08:49:53 +0000
4@@ -145,14 +145,14 @@
5 }
6
7 check_device() {
8- FDISK=$(sudo LC_ALL=C sfdisk -l 2>/dev/null | grep "Disk ${DEVICE}" | awk '{print $2}')
9+ FDISK=$(sudo LC_ALL=C fdisk -l 2>/dev/null | grep "Disk ${DEVICE}" | awk '{print $2}')
10
11 if test "-$FDISK-" = "-$DEVICE:-"
12 then
13 echo ""
14 echo "I see..."
15- echo "sudo sfdisk -l:"
16- sudo LC_ALL=C sfdisk -l 2>/dev/null | grep "Disk /dev/" --color=never
17+ echo "sudo fdisk -l:"
18+ sudo LC_ALL=C fdisk -l 2>/dev/null | grep "Disk /dev/" --color=never
19 echo ""
20 echo "mount:"
21 LC_ALL=C mount | grep -v none | grep "/dev/" --color=never
22@@ -164,8 +164,8 @@
23 echo ""
24 echo "Are you sure? I Don't see [${DEVICE}], here is what I do see..."
25 echo ""
26- echo "sudo sfdisk -l:"
27- sudo LC_ALL=C sfdisk -l 2>/dev/null| grep "Disk /dev/" --color=never
28+ echo "sudo fdisk -l:"
29+ sudo LC_ALL=C fdisk -l 2>/dev/null| grep "Disk /dev/" --color=never
30 echo ""
31 echo "mount:"
32 LC_ALL=C mount | grep -v none | grep "/dev/" --color=never

Subscribers

People subscribed via source and target branches