- Fix byte check for disk encryption check in lsluns (#510032)
- Fix cmm configuration file value initialization parser in cpuplugd
(#511379)
- Check only ZFCP devices in lszfcp (#518669)
This commit is contained in:
Dan Horák
parent
8a0c5c00c8
commit
2355f89767
|
|
@ -0,0 +1,32 @@
|
|||
From 8384b80dac573a65de6610ff8dae753a0e2d6deb Mon Sep 17 00:00:00 2001
|
||||
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Mon, 13 Jul 2009 10:29:52 +0200
|
||||
Subject: [PATCH] s390-tools-1.8.1-lsluns-disk-enc
|
||||
|
||||
Description: lsluns: fix byte check for disk encryption check.
|
||||
Symptom: Encrypted disks are never displayed as encrypted.
|
||||
Problem: The check was performed on the wrong bit.
|
||||
Solution: Perform the check on the correct bit.
|
||||
Problem-ID: 54517
|
||||
---
|
||||
zconf/lsluns | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/zconf/lsluns b/zconf/lsluns
|
||||
index 08a11ba..164282e 100755
|
||||
--- a/zconf/lsluns
|
||||
+++ b/zconf/lsluns
|
||||
@@ -216,8 +216,8 @@ sub show_attached_lun_info
|
||||
(my $mod = substr($inq, 0x10, 0x10)) =~ s/\s*//g;
|
||||
my $type = ord(substr($inq, 0x0, 0x1));
|
||||
my $enc = ($mod =~ /2107/) ?
|
||||
- ord(substr($inq, 0xa2, 0x80)) : 0;
|
||||
- $l .= "(X)" if ($enc & 0x8);
|
||||
+ ord(substr($inq, 0xa2, 0x1)) : 0;
|
||||
+ $l .= "(X)" if ($enc & 0x80);
|
||||
$txt[$type] = $type if (!defined($txt[$type]));
|
||||
print("\t\tlun = $l\t$sg_dev\t$txt[$type]",
|
||||
"\t$vend:$mod\n");
|
||||
--
|
||||
1.6.0.6
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From af1d22ef04368fd201480959ad6647853d82a25e Mon Sep 17 00:00:00 2001
|
||||
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Wed, 26 Aug 2009 14:20:50 +0200
|
||||
Subject: [PATCH 20/21] s390-tools-1.8.1-cpuplugd-cmminit
|
||||
|
||||
---
|
||||
cpuplugd/config.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/cpuplugd/config.c b/cpuplugd/config.c
|
||||
index 93b31e5..c013a65 100644
|
||||
--- a/cpuplugd/config.c
|
||||
+++ b/cpuplugd/config.c
|
||||
@@ -348,7 +348,7 @@ void check_config(struct config *cfg)
|
||||
"configuration detected\n");
|
||||
}
|
||||
}
|
||||
- if (cfg->cmm_max < 0 || cfg->cmm_min < -1
|
||||
+ if (cfg->cmm_max < 0 || cfg->cmm_min < 0
|
||||
|| cfg->cmm_inc < 0 || cfg->memplug == NULL || cfg->update < 0
|
||||
|| cfg->memunplug == NULL) {
|
||||
if (foreground == 1)
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From ce6dabd2c97ae9ff589232f7ff95c699a9755267 Mon Sep 17 00:00:00 2001
|
||||
From: =?utf-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Wed, 26 Aug 2009 14:21:14 +0200
|
||||
Subject: [PATCH 21/21] s390-tools-1.8.1-lszfcp-perf
|
||||
|
||||
---
|
||||
zconf/lszfcp | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/zconf/lszfcp b/zconf/lszfcp
|
||||
index e6fc94f..8ac66ea 100755
|
||||
--- a/zconf/lszfcp
|
||||
+++ b/zconf/lszfcp
|
||||
@@ -231,7 +231,7 @@ show_devices()
|
||||
# Differentiate old and new sysfs layout
|
||||
if $FC_CLASS; then
|
||||
SCSI_DEVICE_LIST=`ls -d \
|
||||
- $SYSFS/devices/css0/*/*/host*/rport*/target*/*/ \
|
||||
+ $SYSFS/bus/ccw/drivers/zfcp/*/host*/rport*/target*/*/ \
|
||||
2>/dev/null |grep -P '\d+:\d+:\d+:\d+'`
|
||||
else
|
||||
SCSI_DEVICE_LIST=`ls -d $SYSFS/devices/css0/*/*/host*/*/`
|
||||
--
|
||||
1.6.3.3
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ Name: s390utils
|
|||
Summary: Utilities and daemons for IBM System/z
|
||||
Group: System Environment/Base
|
||||
Version: 1.8.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Epoch: 2
|
||||
License: GPLv2 and GPLv2+ and CPL
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
|
@ -42,6 +42,9 @@ Patch15: 0015-s390-tools-1.8.1-iucvterm-getlogin-to-getpwuid.patch
|
|||
Patch16: 0016-s390-tools-1.8.1-dumpconf-improve-error-checking.patch
|
||||
Patch17: 0017-s390-tools-1.8.1-cpuplugd-memplug.patch
|
||||
Patch18: 0018-s390-tools-1.8.1-ziomon-new-blkiomon.patch
|
||||
Patch19: 0019-s390-tools-1.8.1-lsluns-disk-enc.patch
|
||||
Patch20: 0020-s390-tools-1.8.1-cpuplugd-cmminit.patch
|
||||
Patch21: 0021-s390-tools-1.8.1-lszfcp-perf.patch
|
||||
|
||||
Patch100: cmsfs-1.1.8-warnings.patch
|
||||
Patch101: cmsfs-1.1.8-kernel26.patch
|
||||
|
|
@ -103,12 +106,21 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
|
|||
%patch14 -p1 -b .zipl-kdump-man
|
||||
|
||||
# Last-minute fixes from IBM
|
||||
%patch15 -p1 -b iucvterm-getlogin-to-getpwuid
|
||||
%patch16 -p1 -b dumpconf-improve-error-checking
|
||||
%patch17 -p1 -b cpuplugd-memplug
|
||||
%patch15 -p1 -b .iucvterm-getlogin-to-getpwuid
|
||||
%patch16 -p1 -b .dumpconf-improve-error-checking
|
||||
%patch17 -p1 -b .cpuplugd-memplug
|
||||
|
||||
# Adapt ziomon to the new layout of the blkiomon_stat structure (#506966)
|
||||
%patch18 -p1 -b ziomon-new-blkiomon
|
||||
%patch18 -p1 -b .ziomon-new-blkiomon
|
||||
|
||||
# Fix byte check for disk encryption check in lsluns (#510032)
|
||||
%patch19 -p1 -b .lsluns-disk-enc
|
||||
|
||||
# Fix cmm configuration file value initialization parser in cpuplugd (#511379)
|
||||
%patch20 -p1 -b .cpuplugd-cmminit
|
||||
|
||||
# Check only ZFCP devices in lszfcp (#518669)
|
||||
%patch21 -p1 -b .lszfcp-perf
|
||||
|
||||
#
|
||||
# cmsfs
|
||||
|
|
@ -734,6 +746,11 @@ This package contains the CMS file system tools.
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Aug 26 2009 Dan Horák <dan[at]danny.cz> 2:1.8.1-2
|
||||
- Fix byte check for disk encryption check in lsluns (#510032)
|
||||
- Fix cmm configuration file value initialization parser in cpuplugd (#511379)
|
||||
- Check only ZFCP devices in lszfcp (#518669)
|
||||
|
||||
* Mon Jun 29 2009 Dan Horák <dan[at]danny.cz> 2:1.8.1-1
|
||||
- update to 1.8.1
|
||||
- drop upstreamed patches
|
||||
|
|
|
|||
Loading…
Reference in New Issue