1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From fed304837f60b626f6198663990e76e506f89063 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 29 Nov 2016 15:58:18 +0100
Subject: [PATCH] sfdisk: don't be silent when list non-existing device
Addresses: https://github.com/karelzak/util-linux/issues/376
Signed-off-by: Karel Zak <kzak@redhat.com>
---
disk-utils/sfdisk.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c
index 52f2a6d..0f69d65 100644
--- a/disk-utils/sfdisk.c
+++ b/disk-utils/sfdisk.c
@@ -560,6 +560,7 @@ static int write_changes(struct sfdisk *sf)
*/
static int command_list_partitions(struct sfdisk *sf, int argc, char **argv)
{
+ int fail = 0;
fdisk_enable_listonly(sf->cxt, 1);
if (argc) {
@@ -568,13 +569,14 @@ static int command_list_partitions(struct sfdisk *sf, int argc, char **argv)
for (i = 0; i < argc; i++) {
if (ct)
fputs("\n\n", stdout);
- if (print_device_pt(sf->cxt, argv[i], 0, sf->verify) == 0)
- ct++;
+ if (print_device_pt(sf->cxt, argv[i], 1, sf->verify) != 0)
+ fail++;
+ ct++;
}
} else
print_all_devices_pt(sf->cxt, sf->verify);
- return 0;
+ return fail;
}
/*
@@ -582,6 +584,7 @@ static int command_list_partitions(struct sfdisk *sf, int argc, char **argv)
*/
static int command_list_freespace(struct sfdisk *sf, int argc, char **argv)
{
+ int fail = 0;
fdisk_enable_listonly(sf->cxt, 1);
if (argc) {
@@ -590,13 +593,14 @@ static int command_list_freespace(struct sfdisk *sf, int argc, char **argv)
for (i = 0; i < argc; i++) {
if (ct)
fputs("\n\n", stdout);
- if (print_device_freespace(sf->cxt, argv[i], 0) == 0)
- ct++;
+ if (print_device_freespace(sf->cxt, argv[i], 1) != 0)
+ fail++;
+ ct++;
}
} else
print_all_devices_freespace(sf->cxt);
- return 0;
+ return fail;
}
/*
--
2.10.2
|
