[s390utils/f20] - fix zFCP device discovery in anaconda GUI (#1054691)
Dan Horák
sharkcz at fedoraproject.org
Tue Mar 4 11:58:44 UTC 2014
commit a1d11a8050443801a160e80b9dc1152cf1044382
Author: Dan Horák <dan at danny.cz>
Date: Tue Mar 4 12:59:40 2014 +0100
- fix zFCP device discovery in anaconda GUI (#1054691)
device_cio_free | 14 ++++++++------
s390utils.spec | 5 ++++-
2 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/device_cio_free b/device_cio_free
index 3367ba1..b4c3750 100644
--- a/device_cio_free
+++ b/device_cio_free
@@ -98,6 +98,13 @@ wait_on_single_device()
# at this point we know the content of ALL_DEVICES is syntacticly correct
wait_on_devices()
{
+ if [ -w $CIO_SETTLE ]; then
+ [ $VERBOSE ] && echo "Waiting until all pending CIO requests are processed"
+ echo 1 > $CIO_SETTLE
+ udevadm settle
+ return
+ fi
+
OLD_IFS=$IFS
IFS=","
set $ALL_DEVICES
@@ -303,9 +310,4 @@ fi
[ -z "$ALL_DEVICES" ] && exit 0
-if [ -w $CIO_SETTLE ]; then
- [ $VERBOSE ] && echo "Waiting until all pending CIO requests are processed"
- echo 1 > $CIO_SETTLE
-else
- wait_on_devices
-fi
+wait_on_devices
diff --git a/s390utils.spec b/s390utils.spec
index c5b5c9d..3933272 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -5,7 +5,7 @@ Name: s390utils
Summary: Utilities and daemons for IBM System/z
Group: System Environment/Base
Version: 1.23.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Epoch: 2
License: GPLv2 and GPLv2+ and CPL
ExclusiveArch: s390 s390x
@@ -734,6 +734,9 @@ User-space development files for the s390/s390x architecture.
%changelog
+* Tue Mar 04 2014 Dan Horák <dan[at]danny.cz> - 2:1.23.0-10
+- fix zFCP device discovery in anaconda GUI (#1054691)
+
* Mon Feb 10 2014 Dan Horák <dan[at]danny.cz> - 2:1.23.0-9
- znetconf: Allow for 16-char network interface names (#1062285)
- qetharp: Allow for 16-char network interface names (#1062250)
More information about the scm-commits
mailing list