updated the Fedora patch set - no vol_id tool in udev (#819530)
This commit is contained in:
Dan Horák
parent
0a5f094516
commit
b7bb250113
|
|
@ -1,14 +1,14 @@
|
|||
From 804e5362c0205f4fd1c060cae9b6ac5972d097a7 Mon Sep 17 00:00:00 2001
|
||||
From e372562dfe57dde54ce942396f9dd5de3d5c160a Mon Sep 17 00:00:00 2001
|
||||
From: Dan Horak <dan@danny.cz>
|
||||
Date: Sun, 20 Jul 2008 09:24:05 +0200
|
||||
Subject: [PATCH 1/4] s390-tools-1.5.3-zipl-zfcpdump-2
|
||||
Subject: [PATCH 1/5] s390-tools-1.5.3-zipl-zfcpdump-2
|
||||
|
||||
---
|
||||
common.mak | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/common.mak b/common.mak
|
||||
index 589deb4..8ab0225 100644
|
||||
index a3c03f7..efb3314 100644
|
||||
--- a/common.mak
|
||||
+++ b/common.mak
|
||||
@@ -62,8 +62,8 @@ GROUP = $(shell id -gn)
|
||||
|
|
@ -23,23 +23,23 @@ index 589deb4..8ab0225 100644
|
|||
export ZFCPDUMP_DIR ZFCPDUMP_IMAGE ZFCPDUMP_RD
|
||||
|
||||
--
|
||||
1.7.4.4
|
||||
1.7.7.6
|
||||
|
||||
|
||||
From dfde1173c937c1bf7a344bcc21ac51fb9b9ca6c1 Mon Sep 17 00:00:00 2001
|
||||
From 1c3a3c032cee5162ebf6f0504aab5232eddae91a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Thu, 23 Apr 2009 11:46:01 +0200
|
||||
Subject: [PATCH 2/4] s390-tools-1.8.1-fdasd-su
|
||||
Subject: [PATCH 2/5] s390-tools-1.8.1-fdasd-su
|
||||
|
||||
---
|
||||
fdasd/fdasd.c | 10 ++++++----
|
||||
1 files changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/fdasd/fdasd.c b/fdasd/fdasd.c
|
||||
index d8cf584..7a61022 100644
|
||||
index fb1f5ce..7dcef66 100644
|
||||
--- a/fdasd/fdasd.c
|
||||
+++ b/fdasd/fdasd.c
|
||||
@@ -2093,10 +2093,12 @@ fdasd_get_geometry (fdasd_anchor_t *anc)
|
||||
@@ -2092,10 +2092,12 @@ fdasd_get_geometry (fdasd_anchor_t *anc)
|
||||
if (anc->verbose) printf("disk type check : ok\n");
|
||||
|
||||
if (dasd_info.FBA_layout != 0) {
|
||||
|
|
@ -57,13 +57,13 @@ index d8cf584..7a61022 100644
|
|||
|
||||
if (anc->verbose) printf("disk layout check : ok\n");
|
||||
--
|
||||
1.7.4.4
|
||||
1.7.7.6
|
||||
|
||||
|
||||
From f8a90e35a49848bfdcc4c984567b83fcb5df379a Mon Sep 17 00:00:00 2001
|
||||
From d6ab931e675f5bd5d56a30e23bef99380c4a0caf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Fri, 19 Jun 2009 10:01:30 +0200
|
||||
Subject: [PATCH 3/4] s390-tools-1.8.1-zipl-kdump-man
|
||||
Subject: [PATCH 3/5] s390-tools-1.8.1-zipl-kdump-man
|
||||
|
||||
Description: Add kdump kernel installation instruction to zipl man page.
|
||||
Symptom: User wants to prepare SCSI disk for dump, but has not installed
|
||||
|
|
@ -76,7 +76,7 @@ Solution: Document that in the zipl man page.
|
|||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/zipl/man/zipl.8 b/zipl/man/zipl.8
|
||||
index 4c12d59..26b79cf 100644
|
||||
index 5d6b891..5673e85 100644
|
||||
--- a/zipl/man/zipl.8
|
||||
+++ b/zipl/man/zipl.8
|
||||
@@ -263,6 +263,8 @@ will be incomplete.
|
||||
|
|
@ -89,13 +89,13 @@ index 4c12d59..26b79cf 100644
|
|||
.BR "\-M <DUMPLIST[,SIZE]>" " or " "--mvdump=<DUMPLIST[,SIZE]>"
|
||||
Install a multi-volume dump record on each device associated with one of the
|
||||
--
|
||||
1.7.4.4
|
||||
1.7.7.6
|
||||
|
||||
|
||||
From 30e79c2abe06873666b7fc159eb2643bad61ef96 Mon Sep 17 00:00:00 2001
|
||||
From 615c54de6d105378ff64464b225a7110774ed1ed Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Fri, 18 Mar 2011 16:35:17 +0100
|
||||
Subject: [PATCH 4/4] switch to using udevadm settle
|
||||
Subject: [PATCH 4/5] switch to using udevadm settle
|
||||
|
||||
---
|
||||
etc/init.d/mon_statd | 2 +-
|
||||
|
|
@ -115,5 +115,32 @@ index 60bcf00..b6699c7 100755
|
|||
exit 1
|
||||
fi
|
||||
--
|
||||
1.7.4.4
|
||||
1.7.7.6
|
||||
|
||||
|
||||
From 97b0b44f7ec5b13ecd63f40db96b7a9bc41ec890 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Fri, 11 May 2012 14:56:34 +0200
|
||||
Subject: [PATCH 5/5] vol_id doesn't exist for some years
|
||||
|
||||
The vol_id utility doesn't exist for some years in udev and seems the rule isn't
|
||||
required for proper function of the system. (rhbz#819530)
|
||||
---
|
||||
etc/udev/rules.d/59-dasd.rules | 1 -
|
||||
1 files changed, 0 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/etc/udev/rules.d/59-dasd.rules b/etc/udev/rules.d/59-dasd.rules
|
||||
index 5e94389..7bbcd22 100644
|
||||
--- a/etc/udev/rules.d/59-dasd.rules
|
||||
+++ b/etc/udev/rules.d/59-dasd.rules
|
||||
@@ -28,7 +28,6 @@ LABEL="dasd_partition_end"
|
||||
|
||||
ENV{ID_SERIAL}!="?*", GOTO="dasd_symlinks_end"
|
||||
# by-label/by-uuid (filesystem properties)
|
||||
-IMPORT{program}="vol_id --export $tempnode"
|
||||
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
|
||||
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
|
||||
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ Name: s390utils
|
|||
Summary: Utilities and daemons for IBM System/z
|
||||
Group: System Environment/Base
|
||||
Version: 1.16.0
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
Epoch: 2
|
||||
License: GPLv2 and GPLv2+ and CPL
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
|
@ -39,7 +39,7 @@ Source18: cpuplugd.initd
|
|||
Source19: mon_statd.initd
|
||||
Source20: 40-z90crypt.rules
|
||||
|
||||
Patch1: s390-tools-1.14.0-fedora.patch
|
||||
Patch1: s390-tools-1.16.0-fedora.patch
|
||||
|
||||
Patch1000: cmsfs-1.1.8-warnings.patch
|
||||
Patch1001: cmsfs-1.1.8-kernel26.patch
|
||||
|
|
@ -863,6 +863,9 @@ User-space development files for the s390/s390x architecture.
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri May 11 2012 Dan Horák <dan[at]danny.cz> 2:1.16.0-6
|
||||
- updated the Fedora patch set - no vol_id tool in udev (#819530)
|
||||
|
||||
* Fri May 4 2012 Dan Horák <dan[at]danny.cz> 2:1.16.0-5
|
||||
- zipl.conf must be owned by s390utils-base (#818877)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue