8d7553371c
- Updated the .spec file to use gcc13 (bsc#1217838)
- Amended read_values for '-S' option (bsc#1217923)
- Upgrade s390-tools to version 2.30
(jsc#PED-5783, jsc#PED-6785, jsc#PED-7136, jsc#PED-6539, jsc#PED-4604,
jsc#PED-6649, jsc#PED-7138 )
- Amended the SUSE patches for version 2.30
- Revendored vendor.tar.gz
- Provide s390-tools on x86_64 to enable Secure Execution in the Cloud
(jsc#PED-578, jsc#PED-7136, and jsc#PED-7138)
* Selected tools from the s390-tools package need to be made available on x86_64.
OBS-URL: https://build.opensuse.org/request/show/1133714
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=185
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
From 943e577440d74ad7f8787af2590c8ab4579a459b Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 5 Nov 2015 10:57:38 +0100
|
|
Subject: [PATCH] dasdfmt: retry BIODASDINFO if device is busy
|
|
|
|
Modern udev have the wonderful 'feature' to sending a 'change'
|
|
event whenever a device opened with O_RDWR is closed again.
|
|
The reasoning is that the said program _might_ have changed
|
|
the partition table and hence we _might_ have missed a partition
|
|
update.
|
|
But in doing so it not only generated tons of pointless events
|
|
but also confused the hell out of other programs.
|
|
Idiots.
|
|
|
|
References: bsc#937340
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
dasdfmt/dasdfmt.c | 21 ++++++++++++++++++---
|
|
1 file changed, 18 insertions(+), 3 deletions(-)
|
|
|
|
Index: s390-tools-2.30.0/dasdfmt/dasdfmt.c
|
|
===================================================================
|
|
--- s390-tools-2.30.0.orig/dasdfmt/dasdfmt.c
|
|
+++ s390-tools-2.30.0/dasdfmt/dasdfmt.c
|
|
@@ -621,7 +621,7 @@ static void check_layout(unsigned int in
|
|
*/
|
|
static void check_disk(void)
|
|
{
|
|
- int err;
|
|
+ int err, index = 0 ;
|
|
bool ro;
|
|
|
|
err = dasd_is_ro(g.dev_node, &ro);
|
|
@@ -631,6 +631,23 @@ static void check_disk(void)
|
|
if (ro)
|
|
error("Disk %s is read only!", g.dev_path);
|
|
if (!g.force) {
|
|
+ /*
|
|
+ * udev strikes again.
|
|
+ * Modern udev will issue a 'change' event whenever
|
|
+ * a device opened with O_RDWR is closed again.
|
|
+ * On the grounds that program _might_ have changed
|
|
+ * the partition table.
|
|
+ * And confusing the hell out ouf anyone else.
|
|
+ * Bah.
|
|
+ */
|
|
+ for ( index = 0 ; index < 6 ; index++ ) {
|
|
+ if (g.dasd_info.open_count > 1) {
|
|
+ dasd_get_info(g.dev_node, &g.dasd_info);
|
|
+ sleep(1);
|
|
+ }
|
|
+ else break;
|
|
+
|
|
+ }
|
|
if (g.dasd_info.open_count > 1)
|
|
error("Disk %s is in use!", g.dev_path);
|
|
}
|