pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 229723 from home:hreinecke:branches:Base:System

Browse Source 
- Install correct rule files for multipath support (bnc#873151)
  Add: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch
  Add: 0021-90multipath-install-correct-multipath-rules.patch

- Compress initrd with xz --check=crc32 -6 by default

OBS-URL: https://build.opensuse.org/request/show/229723
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=129
This commit is contained in:
Shawn Dunn 2014-04-11 18:08:53 +00:00 committed by Git OBS Bridge
parent d7788df7bd
commit 70f60c4d7d
4 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0020-95udev-rules-Include-correct-sg3_utils-rules.patch Normal file
View File

@ -0,0 +1,33 @@
From a292b9581c55173b1e55f1c24b186a5129034324 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 11 Apr 2014 13:00:58 +0200
Subject: [PATCH] 95udev-rules: Include correct sg3_utils rules
sg3_utils now provides two rules 55-scsi-sg3_id.rules and
58-scsi-sg3_symlink.rules, which need to be included instead
of the older 59-scsi-sg3_utils.rules.
References: bnc#873151
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
modules.d/95udev-rules/module-setup.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
index d63066f..044dbd1 100755
--- a/modules.d/95udev-rules/module-setup.sh
+++ b/modules.d/95udev-rules/module-setup.sh
@@ -27,7 +27,8 @@ install() {
exit 1
fi
- inst_rules 50-udev-default.rules 59-scsi-sg3_utils.rules \
+ inst_rules 50-udev-default.rules \
+ 55-scsi-sg3_id.rules 58-scsi-sg3_symlink.rules \
60-persistent-storage.rules \
61-persistent-storage-edd.rules 80-drivers.rules 95-udev-late.rules \
60-pcmcia.rules \
--
1.8.1.4

31
0021-90multipath-install-correct-multipath-rules.patch Normal file
View File

@ -0,0 +1,31 @@
From 78dc7fe3690051c714e37067f3d9d13ed7aac976 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Fri, 11 Apr 2014 13:02:56 +0200
Subject: [PATCH] 90multipath: install correct multipath rules
The multipath rule got renamed to 56-multipath.rules, and
the 6*-multipath.rules were never provided by SLES.
References: bnc#873151
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
modules.d/90multipath/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index 9715851..508241e 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -101,7 +101,7 @@ install() {
inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
- inst_rules 40-multipath.rules 62-multipath.rules 65-multipath.rules \
+ inst_rules 56-multipath.rules \
66-kpartx.rules 67-kpartx-compat.rules
}
--
1.8.1.4

9
dracut.changes
View File

@ -1,8 +1,15 @@
-------------------------------------------------------------------
Fri Apr 11 13:07:05 CEST 2014 - hare@suse.de
- Install correct rule files for multipath support (bnc#873151)
Add: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch
Add: 0021-90multipath-install-correct-multipath-rules.patch
-------------------------------------------------------------------
Thu Apr 10 14:49:23 UTC 2014 - trenn@suse.de
- Do not always try to add iscsi module, let its check function decide
- Copmress initrd with xz --check=crc32 -6 by default
- Compress initrd with xz --check=crc32 -6 by default
-------------------------------------------------------------------
Wed Apr 9 16:47:27 UTC 2014 - crrodriguez@opensuse.org

4
dracut.spec
View File

@ -55,6 +55,8 @@ Patch28: 0016-90multipath-add-67-kpartx-compat.rules.patch
Patch29: 0017-90multipath-install-dracut-specific-service-file.patch
Patch30: 0018-fstab-do-not-mount-and-fsck-from-fstab-if-using-syst.patch
Patch31: 0019-dracut-initqueue-service-runs-before-remote-fs-pre.t.patch
Patch32: 0020-95udev-rules-Include-correct-sg3_utils-rules.patch
Patch33: 0021-90multipath-install-correct-multipath-rules.patch
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@ -114,6 +116,8 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package.
%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%build
%configure\