Accepting request 1084572 from home:ngueorguiev:branches:Base:System

-  Applied patches for ziomon: fix for SCSI devices of type disk without block dev
    (bsc#1211008)
  * s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
  * s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch

OBS-URL: https://build.opensuse.org/request/show/1084572
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=171
This commit is contained in:
Nikolay Gueorguiev 2023-05-04 09:04:23 +00:00 committed by Git OBS Bridge
parent 0d293958ac
commit 218a82336b
4 changed files with 45 additions and 0 deletions

View File

@ -0,0 +1,19 @@
---
ziomon/ziorep_config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/ziomon/ziorep_config
+++ b/ziomon/ziorep_config
@@ -123,11 +123,11 @@ sub get_device_data
} else {
$devices{$hctl}{dev} = glob_last("block\:sd*");
}
+ $devices{$hctl}{sg_mm} = get_line("generic", "dev");
$c_src = $devices{$hctl}{dev};
$devices{$hctl}{dev} =~ s/.*(sd[a-z0-9]+)\Z/$1/
unless(!$devices{$hctl}{dev});
$devices{$hctl}{mm} = get_line("dev");
- $devices{$hctl}{sg_mm} = get_line("generic", "dev");
$devices{$hctl}{mp_dev} = glob_last("holders", "dm*");
$devices{$hctl}{mp_dev} =~ s/.*\/(.+)\Z/$1/
unless (!$devices{$hctl}{mp_dev});

View File

@ -0,0 +1,14 @@
---
ziomon/ziorep_config | 1 +
1 file changed, 1 insertion(+)
--- a/ziomon/ziorep_config
+++ b/ziomon/ziorep_config
@@ -124,6 +124,7 @@ sub get_device_data
$devices{$hctl}{dev} = glob_last("block\:sd*");
}
$devices{$hctl}{sg_mm} = get_line("generic", "dev");
+ next if !defined $devices{$hctl}{dev};
$c_src = $devices{$hctl}{dev};
$devices{$hctl}{dev} =~ s/.*(sd[a-z0-9]+)\Z/$1/
unless(!$devices{$hctl}{dev});

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu May 4 08:32:36 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- Applied patches for ziomon: fix for SCSI devices of type disk without block dev
(bsc#1211008)
* s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
* s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
-------------------------------------------------------------------
Tue May 2 11:40:12 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>

View File

@ -171,6 +171,10 @@ Patch926: s390-tools-sles15sp5-15-zipl-Embed-loader-data-directly-into-boo
Patch927: s390-tools-sles15sp5-lszcrypt-use-separate-index-for-inner-sub-device-loo.patch
#
Patch928: s390-tools-ALP-zdev-live.patch
# Bug 1211008
Patch929: s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
Patch930: s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
#
Patch999: s390-tools-sles15sp5-fix-chown-commands-syntax.patch