mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-11 11:14:36 +08:00
bd9f0021d2
- bash-completion: remove duplicate part in util-linux - util-linux: update and build against new ncurses group
71 lines
1.8 KiB
Diff
71 lines
1.8 KiB
Diff
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
|
|
|