From ad9fe47e751a73a55aeb25ae895544e03e900aa9 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 11 Mar 2014 12:22:35 +0100 Subject: [PATCH] cfdisk: follow terminal-colors.d Signed-off-by: Karel Zak --- disk-utils/cfdisk.c | 2 +- tests/expected/fdisk/gpt | 106 +++++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index 5c04c170d..0b1641eb2 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -1787,7 +1787,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out) int main(int argc, char *argv[]) { - int rc, c, colormode = UL_COLORMODE_AUTO; + int rc, c, colormode = UL_COLORMODE_UNDEF; struct cfdisk _cf = { .lines_idx = 0 }, *cf = &_cf; diff --git a/tests/expected/fdisk/gpt b/tests/expected/fdisk/gpt index 7fb752adb..2ca66ab84 100644 --- a/tests/expected/fdisk/gpt +++ b/tests/expected/fdisk/gpt @@ -23,15 +23,15 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: -Device Start End Size Type -1 2048 4095 1M EFI System -2 4096 6143 1M Linux filesystem -3 6144 8191 1M Linux filesystem -4 8192 10239 1M Linux filesystem -5 10240 12287 1M Linux filesystem -6 12288 14335 1M Linux filesystem -7 14336 16383 1M Linux filesystem -8 16384 18431 1M Linux filesystem +Device Start End Sectors Size Type +1 2048 4095 2048 1M EFI System +2 4096 6143 2048 1M Linux filesystem +3 6144 8191 2048 1M Linux filesystem +4 8192 10239 2048 1M Linux filesystem +5 10240 12287 2048 1M Linux filesystem +6 12288 14335 2048 1M Linux filesystem +7 14336 16383 2048 1M Linux filesystem +8 16384 18431 2048 1M Linux filesystem ------------------- @@ -45,15 +45,15 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: -Device Start End Size Type -1 2048 4095 1M EFI System -2 4096 6143 1M Linux filesystem -3 6144 8191 1M Linux filesystem -4 8192 10239 1M Linux filesystem -5 10240 12287 1M Linux swap -6 12288 14335 1M Linux filesystem -7 14336 16383 1M Linux filesystem -8 16384 18431 1M Linux filesystem +Device Start End Sectors Size Type +1 2048 4095 2048 1M EFI System +2 4096 6143 2048 1M Linux filesystem +3 6144 8191 2048 1M Linux filesystem +4 8192 10239 2048 1M Linux filesystem +5 10240 12287 2048 1M Linux swap +6 12288 14335 2048 1M Linux filesystem +7 14336 16383 2048 1M Linux filesystem +8 16384 18431 2048 1M Linux filesystem ------------------- @@ -67,14 +67,14 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: -Device Start End Size Type -1 2048 4095 1M EFI System -3 6144 8191 1M Linux filesystem -4 8192 10239 1M Linux filesystem -5 10240 12287 1M Linux swap -6 12288 14335 1M Linux filesystem -7 14336 16383 1M Linux filesystem -8 16384 18431 1M Linux filesystem +Device Start End Sectors Size Type +1 2048 4095 2048 1M EFI System +3 6144 8191 2048 1M Linux filesystem +4 8192 10239 2048 1M Linux filesystem +5 10240 12287 2048 1M Linux swap +6 12288 14335 2048 1M Linux filesystem +7 14336 16383 2048 1M Linux filesystem +8 16384 18431 2048 1M Linux filesystem ------------------- @@ -88,15 +88,15 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: -Device Start End Size Type -1 2048 4095 1M EFI System -2 4096 6143 1M Linux filesystem -3 6144 8191 1M Linux filesystem -4 8192 10239 1M Linux filesystem -5 10240 12287 1M Linux swap -6 12288 14335 1M Linux filesystem -7 14336 16383 1M Linux filesystem -8 16384 18431 1M Linux filesystem +Device Start End Sectors Size Type +1 2048 4095 2048 1M EFI System +2 4096 6143 2048 1M Linux filesystem +3 6144 8191 2048 1M Linux filesystem +4 8192 10239 2048 1M Linux filesystem +5 10240 12287 2048 1M Linux swap +6 12288 14335 2048 1M Linux filesystem +7 14336 16383 2048 1M Linux filesystem +8 16384 18431 2048 1M Linux filesystem ------------------- @@ -110,15 +110,15 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: -Device Start End Size Type -1 2048 4095 1M EFI System -2 4096 6143 1M Linux filesystem -3 6144 8191 1M Linux filesystem -4 8192 10239 1M Linux filesystem -5 10240 12287 1M Linux swap -6 12288 14335 1M Linux filesystem -7 14336 16383 1M Linux filesystem -8 16384 18431 1M Linux filesystem +Device Start End Sectors Size Type +1 2048 4095 2048 1M EFI System +2 4096 6143 2048 1M Linux filesystem +3 6144 8191 2048 1M Linux filesystem +4 8192 10239 2048 1M Linux filesystem +5 10240 12287 2048 1M Linux swap +6 12288 14335 2048 1M Linux filesystem +7 14336 16383 2048 1M Linux filesystem +8 16384 18431 2048 1M Linux filesystem ------------------- @@ -132,15 +132,15 @@ I/O size (minimum/optimal): 512 bytes / 512 bytes Disklabel type: gpt Disk identifier: -Device Start End Size Type -1 2048 4095 1M EFI System -2 4096 6143 1M Linux filesystem -3 6144 8191 1M Linux filesystem -4 8192 10239 1M Linux filesystem -5 10240 12287 1M Linux swap -6 12288 14335 1M Linux filesystem -7 14336 16383 1M Linux filesystem -8 16384 18431 1M Linux filesystem +Device Start End Sectors Size Type +1 2048 4095 2048 1M EFI System +2 4096 6143 2048 1M Linux filesystem +3 6144 8191 2048 1M Linux filesystem +4 8192 10239 2048 1M Linux filesystem +5 10240 12287 2048 1M Linux swap +6 12288 14335 2048 1M Linux filesystem +7 14336 16383 2048 1M Linux filesystem +8 16384 18431 2048 1M Linux filesystem -------------------