From f57e137863d14386e71081ad00c5b74ca437d7c7 Mon Sep 17 00:00:00 2001
From: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
Date: Thu, 17 May 2018 19:13:30 +0200
Subject: [PATCH] util linux patches

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
---
 .../0093-fdisk-improve-l-error-handling.patch | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 SOURCES/0093-fdisk-improve-l-error-handling.patch

diff --git a/SOURCES/0093-fdisk-improve-l-error-handling.patch b/SOURCES/0093-fdisk-improve-l-error-handling.patch
new file mode 100644
index 00000000..f47e229c
--- /dev/null
+++ b/SOURCES/0093-fdisk-improve-l-error-handling.patch
@@ -0,0 +1,75 @@
+From e4f26d51bd06910634c2aaeccfecc7e6cd61ef0a Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Fri, 17 Mar 2017 11:47:00 +0100
+Subject: [PATCH 093/116] fdisk: improve -l error handling
+
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1362662
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ fdisks/fdisk.c | 23 ++++++++++++++++-------
+ 1 file changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/fdisks/fdisk.c b/fdisks/fdisk.c
+index 974d735..177921a 100644
+--- a/fdisks/fdisk.c
++++ b/fdisks/fdisk.c
+@@ -924,11 +924,15 @@ static int is_ide_cdrom_or_tape(char *device)
+ }
+
+ /* Print disk geometry and partition table of a specified device (-l option) */
+-static void print_partition_table_from_option(struct fdisk_context *cxt,
+-				char *device, unsigned long sector_size)
++static int print_partition_table_from_option(struct fdisk_context *cxt,
++				char *device, unsigned long sector_size,
++				int warnme)
+ {
+-	if (fdisk_context_assign_device(cxt, device, 1) != 0)	/* read-only */
+-		err(EXIT_FAILURE, _("cannot open %s"), device);
++	if (fdisk_context_assign_device(cxt, device, 1) != 0) {	/* read-only */
++		if (warnme || errno == EACCES)
++			warn(_("cannot open %s"), device);
++		return -1;
++	}
+
+	if (sector_size) /* passed -b option, override autodiscovery */
+		fdisk_override_sector_size(cxt, sector_size);
+@@ -941,6 +945,8 @@ static void print_partition_table_from_option(struct fdisk_context *cxt,
+		list_table(cxt, 0);
+	else
+		list_disk_geometry(cxt);
++
++	return 0;
+ }
+
+ /*
+@@ -971,7 +977,7 @@ print_all_partition_table_from_option(struct fdisk_context *cxt,
+			char *cn = canonicalize_path(devname);
+			if (cn) {
+				if (!is_ide_cdrom_or_tape(cn))
+-					print_partition_table_from_option(cxt, cn, sector_size);
++					print_partition_table_from_option(cxt, cn, sector_size, 0);
+				free(cn);
+			}
+		}
+@@ -1223,14 +1229,17 @@ int main(int argc, char **argv)
+			 " be used with one specified device\n"));
+
+	if (optl) {
++		int rc = 0;
++
+		nowarn = 1;
+		if (argc > optind) {
+			int k;
+			for (k = optind; k < argc; k++)
+-				print_partition_table_from_option(cxt, argv[k], sector_size);
++				rc += print_partition_table_from_option(cxt, argv[k], sector_size, 1);
+		} else
+			print_all_partition_table_from_option(cxt, sector_size);
+-		exit(EXIT_SUCCESS);
++
++		exit(rc ? EXIT_FAILURE : EXIT_SUCCESS);
+	}
+
+	if (opts) {
+--
+2.9.3