From: Karel Zak <kzak@redhat.com>
Date: Tue, 11 Mar 2014 11:22:35 +0000 (+0100)
Subject: cfdisk: follow terminal-colors.d
X-Git-Tag: v2.25-rc1~443
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad9fe47e751a73a55aeb25ae895544e03e900aa9;p=thirdparty%2Futil-linux.git

cfdisk: follow terminal-colors.d

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index 5c04c170d9..0b1641eb20 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 7fb752adb4..2ca66ab842 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: <removed>
 
-Device             Start          End Size Type
-<removed>1         2048         4095   1M EFI System
-<removed>2         4096         6143   1M Linux filesystem
-<removed>3         6144         8191   1M Linux filesystem
-<removed>4         8192        10239   1M Linux filesystem
-<removed>5        10240        12287   1M Linux filesystem
-<removed>6        12288        14335   1M Linux filesystem
-<removed>7        14336        16383   1M Linux filesystem
-<removed>8        16384        18431   1M Linux filesystem
+Device             Start   End Sectors Size Type
+<removed>1  2048  4095    2048   1M EFI System
+<removed>2  4096  6143    2048   1M Linux filesystem
+<removed>3  6144  8191    2048   1M Linux filesystem
+<removed>4  8192 10239    2048   1M Linux filesystem
+<removed>5 10240 12287    2048   1M Linux filesystem
+<removed>6 12288 14335    2048   1M Linux filesystem
+<removed>7 14336 16383    2048   1M Linux filesystem
+<removed>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: <removed>
 
-Device             Start          End Size Type
-<removed>1         2048         4095   1M EFI System
-<removed>2         4096         6143   1M Linux filesystem
-<removed>3         6144         8191   1M Linux filesystem
-<removed>4         8192        10239   1M Linux filesystem
-<removed>5        10240        12287   1M Linux swap
-<removed>6        12288        14335   1M Linux filesystem
-<removed>7        14336        16383   1M Linux filesystem
-<removed>8        16384        18431   1M Linux filesystem
+Device             Start   End Sectors Size Type
+<removed>1  2048  4095    2048   1M EFI System
+<removed>2  4096  6143    2048   1M Linux filesystem
+<removed>3  6144  8191    2048   1M Linux filesystem
+<removed>4  8192 10239    2048   1M Linux filesystem
+<removed>5 10240 12287    2048   1M Linux swap
+<removed>6 12288 14335    2048   1M Linux filesystem
+<removed>7 14336 16383    2048   1M Linux filesystem
+<removed>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: <removed>
 
-Device             Start          End Size Type
-<removed>1         2048         4095   1M EFI System
-<removed>3         6144         8191   1M Linux filesystem
-<removed>4         8192        10239   1M Linux filesystem
-<removed>5        10240        12287   1M Linux swap
-<removed>6        12288        14335   1M Linux filesystem
-<removed>7        14336        16383   1M Linux filesystem
-<removed>8        16384        18431   1M Linux filesystem
+Device             Start   End Sectors Size Type
+<removed>1  2048  4095    2048   1M EFI System
+<removed>3  6144  8191    2048   1M Linux filesystem
+<removed>4  8192 10239    2048   1M Linux filesystem
+<removed>5 10240 12287    2048   1M Linux swap
+<removed>6 12288 14335    2048   1M Linux filesystem
+<removed>7 14336 16383    2048   1M Linux filesystem
+<removed>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: <removed>
 
-Device             Start          End Size Type
-<removed>1         2048         4095   1M EFI System
-<removed>2         4096         6143   1M Linux filesystem
-<removed>3         6144         8191   1M Linux filesystem
-<removed>4         8192        10239   1M Linux filesystem
-<removed>5        10240        12287   1M Linux swap
-<removed>6        12288        14335   1M Linux filesystem
-<removed>7        14336        16383   1M Linux filesystem
-<removed>8        16384        18431   1M Linux filesystem
+Device             Start   End Sectors Size Type
+<removed>1  2048  4095    2048   1M EFI System
+<removed>2  4096  6143    2048   1M Linux filesystem
+<removed>3  6144  8191    2048   1M Linux filesystem
+<removed>4  8192 10239    2048   1M Linux filesystem
+<removed>5 10240 12287    2048   1M Linux swap
+<removed>6 12288 14335    2048   1M Linux filesystem
+<removed>7 14336 16383    2048   1M Linux filesystem
+<removed>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: <removed>
 
-Device             Start          End Size Type
-<removed>1         2048         4095   1M EFI System
-<removed>2         4096         6143   1M Linux filesystem
-<removed>3         6144         8191   1M Linux filesystem
-<removed>4         8192        10239   1M Linux filesystem
-<removed>5        10240        12287   1M Linux swap
-<removed>6        12288        14335   1M Linux filesystem
-<removed>7        14336        16383   1M Linux filesystem
-<removed>8        16384        18431   1M Linux filesystem
+Device             Start   End Sectors Size Type
+<removed>1  2048  4095    2048   1M EFI System
+<removed>2  4096  6143    2048   1M Linux filesystem
+<removed>3  6144  8191    2048   1M Linux filesystem
+<removed>4  8192 10239    2048   1M Linux filesystem
+<removed>5 10240 12287    2048   1M Linux swap
+<removed>6 12288 14335    2048   1M Linux filesystem
+<removed>7 14336 16383    2048   1M Linux filesystem
+<removed>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: <removed>
 
-Device             Start          End Size Type
-<removed>1         2048         4095   1M EFI System
-<removed>2         4096         6143   1M Linux filesystem
-<removed>3         6144         8191   1M Linux filesystem
-<removed>4         8192        10239   1M Linux filesystem
-<removed>5        10240        12287   1M Linux swap
-<removed>6        12288        14335   1M Linux filesystem
-<removed>7        14336        16383   1M Linux filesystem
-<removed>8        16384        18431   1M Linux filesystem
+Device             Start   End Sectors Size Type
+<removed>1  2048  4095    2048   1M EFI System
+<removed>2  4096  6143    2048   1M Linux filesystem
+<removed>3  6144  8191    2048   1M Linux filesystem
+<removed>4  8192 10239    2048   1M Linux filesystem
+<removed>5 10240 12287    2048   1M Linux swap
+<removed>6 12288 14335    2048   1M Linux filesystem
+<removed>7 14336 16383    2048   1M Linux filesystem
+<removed>8 16384 18431    2048   1M Linux filesystem
 
 -------------------