ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libfdisk: (bsd) fix output 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-03-11 12:33:30 +01:00
parent ad9fe47e75
commit 41050b7e23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfdisk/src/bsd.c
View File

@ -425,6 +425,8 @@ static int bsd_get_partition(struct fdisk_context *cxt, size_t n,
pa->end_post = (p->p_offset + p->p_size) % d->d_secpercyl ? '*' : ' ';
}
pa->start = p->p_offset;
pa->end = p->p_offset + p->p_size - 1;
pa->size = p->p_size;
pa->type = bsd_partition_parttype(cxt, p);
@ -879,9 +881,9 @@ static const struct fdisk_column bsd_columns[] =
{ FDISK_COL_DEVICE, N_("Slice"), 1, 0 },
{ FDISK_COL_START, N_("Start"), 5, TT_FL_RIGHT },
{ FDISK_COL_END, N_("End"), 5, TT_FL_RIGHT },
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT },
{ FDISK_COL_SECTORS, N_("Sectors"), 5, TT_FL_RIGHT },
{ FDISK_COL_CYLINDERS, N_("Cylinders"), 5, TT_FL_RIGHT },
{ FDISK_COL_SIZE, N_("Size"), 5, TT_FL_RIGHT },
{ FDISK_COL_TYPE, N_("Type"), 8, 0 },
{ FDISK_COL_FSIZE, N_("Fsize"), 5, TT_FL_RIGHT },
{ FDISK_COL_BSIZE, N_("Bsize"), 5, TT_FL_RIGHT },

30
tests/expected/fdisk/bsd
View File

@ -25,8 +25,8 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: dos
Disk identifier: <removed>
Device Boot Start End Blocks Id System
<removed>1 2048 4095 1024 83 Linux
Device Boot Start End Sectors Size Id Type
<removed>1 2048 4095 2048 1M 83 Linux
-------------------
@ -43,9 +43,9 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: dos
Disk identifier: <removed>
Device Boot Start End Blocks Id System
<removed>1 2048 4095 1024 83 Linux
<removed>2 4096 20479 8192 a5 FreeBSD
Device Boot Start End Sectors Size Id Type
<removed>1 2048 4095 2048 1M 83 Linux
<removed>2 4096 20479 16384 8M a5 FreeBSD
-------------------
@ -68,12 +68,11 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: bsd
partitions: 4
# Start End Size Type fsize bsize cpg
c 4096 20479 16384 unused 0 0
d 0 16064 16065 unused 0 0
Slice Start End Sectors Size Type Fsize Bsize Cpg
c 4096 20479 16384 8M unused 0 0 0
d 0 16064 16065 7.9M unused 0 0 0
Command (m for help):
Leaving nested disklabel.
Command (m for help): Leaving nested disklabel.
Command (m for help):
-------------------
@ -96,13 +95,12 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes
Disklabel type: bsd
partitions: 4
# Start End Size Type fsize bsize cpg
a 4096 6144 2049 4.2BSD 0 0 0
c 4096 20479 16384 unused 0 0
d 0 16064 16065 unused 0 0
Slice Start End Sectors Size Type Fsize Bsize Cpg
a 4096 6144 2049 1M 4.2BSD 0 0 0
c 4096 20479 16384 8M unused 0 0 0
d 0 16064 16065 7.9M unused 0 0 0
Command (m for help):
Leaving nested disklabel.
Command (m for help): Leaving nested disklabel.
Command (m for help):
-------------------