Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked in at 2016-09-05 21:16:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut (Old)
and /work/SRC/openSUSE:Factory/.dracut.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut"
Changes:
--------
--- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2016-08-05 18:14:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2016-09-05 21:16:47.000000000 +0200
@@ -1,0 +2,65 @@
+Fri Aug 26 10:17:27 CEST 2016 - hare@suse.de
+
+- Rename patch:
+ * From 0211-fix_multipath_check_hostonly.patch
+ to 0303-fix_multipath_check_hostonly.patch
+- Rename patch:
+ * From 0213-10i18n-keymap-find.patch
+ to 0213-Fix-wrong-keymap-inclusion.patch
+
+-------------------------------------------------------------------
+Thu Aug 25 11:59:56 CEST 2016 - hare@suse.de
+
+- 95fcoe: Do not complain about missing /etc/hba.conf (bsc#980539)
+ * Add 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
+- 95fcoe: silence lldpad warnings
+ * Add 0216-95fcoe-silence-lldpad-warnings.patch
+- 95fcoe: Allow to specify the FCoE mode via the fcoe= parameter
+ * Add 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
+- 40network: allow persistent interface names (bsc#995284)
+ * Add 0218-40network-allow-persistent-interface-names.patch
+- 95fcoe: use interface names instead of MAC addresses
+ * Add 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
+- 95fcoe: always set AUTO_VLAN for fcoemon (bsc#995019)
+ * Add 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
+- 95fcoe: Add shutdown script (bsc#994860)
+ * Add 0221-95fcoe-Add-shutdown-script.patch
+- 90dm: Fixup shutdown script (bsc#994860)
+ * Add 0222-90dm-Fixup-shutdown-script.patch
+- 90dm: fixup dependency cycle between MD and DM shutdown (bsc#994860)
+ * Add 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
+- 90multipath: Start daemon after udev settle (bsc#986734)
+ * Add 0304-90multipath-Start-daemon-after-udev-settle.patch
+- 90multipath: load dm_multipath module during startup
+ * Add 0305-90multipath-load-dm_multipath-module-during-startup.patch
+- 90multipath: add shutdown script (bsc#994860)
+ * Add 0306-90multipath-add-shutdown-script.patch
+
+-------------------------------------------------------------------
+Tue Aug 23 13:36:18 CEST 2016 - hare@suse.de
+
+- Reformat patches and add patch header:
+ * 0053-01fips-fixup-loading-issues.patch
+ * 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch
+ * 0128-90lvm-Install-dm-snapshot-module.patch
+ * 0133-Allow-multiple-configurations-per-network-interface-.patch
+ * 0138-fips_add_aesni-intel.patch
+ * 0168-remove_plymouth_logo_file.patch
+ * 0169-network_set_mtu_macaddr_for_dhcp.patch
+ * 0170-iscsi-skip-ibft-invalid-dhcp.patch
+ * 0180-i18n_add_correct_fontmaps.patch
+ * 0196-ibft-wait-for-session-on-all-paths.patch
+ * 0201-fix_nfs_with_ip_instead_of_hostname.patch
+ * 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch
+ * fips-kernel-4.4-fixes.patch
+- Rename patch:
+ * from fips-kernel-4.4-fixes.patch
+ * to 0139-fips-kernel-4.4-fixes.patch
+
+-------------------------------------------------------------------
+Fri Aug 19 10:09:30 CEST 2016 - hare@suse.de
+
+- Do not overwrite existing FCoE configuration (bsc#993861)
+ * Add 0214-95fcoe-Do-not-overwrite-FCoE-configuration.patch
+
+-------------------------------------------------------------------
Old:
----
0211-fix_multipath_check_hostonly.patch
0213-10i18n-keymap-find.patch
fips-kernel-4.4-fixes.patch
New:
----
0139-fips-kernel-4.4-fixes.patch
0213-Fix-wrong-keymap-inclusion.patch
0214-95fcoe-Do-not-overwrite-FCoE-configuration.patch
0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
0216-95fcoe-silence-lldpad-warnings.patch
0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
0218-40network-allow-persistent-interface-names.patch
0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
0221-95fcoe-Add-shutdown-script.patch
0222-90dm-Fixup-shutdown-script.patch
0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
0303-fix_multipath_check_hostonly.patch
0304-90multipath-Start-daemon-after-udev-settle.patch
0305-90multipath-load-dm_multipath-module-during-startup.patch
0306-90multipath-add-shutdown-script.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:49.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:49.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package dracut
#
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -90,7 +90,7 @@
Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch
Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch
Patch138: 0138-fips_add_aesni-intel.patch
-Patch139: fips-kernel-4.4-fixes.patch
+Patch139: 0139-fips-kernel-4.4-fixes.patch
# Others
Patch20: 0020-00warpclock-Set-correct-timezone.patch
@@ -133,13 +133,26 @@
Patch209: 0209-fix_modules_load_d_hostonly.patch
Patch210: 0210-add_fcoe_uefi_check.patch
Patch212: 0212-fcoe_reorder_init_path.patch
-Patch213: 0213-10i18n-keymap-find.patch
+Patch213: 0213-Fix-wrong-keymap-inclusion.patch
+Patch214: 0214-95fcoe-Do-not-overwrite-FCoE-configuration.patch
+Patch215: 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch
+Patch216: 0216-95fcoe-silence-lldpad-warnings.patch
+Patch217: 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch
+Patch218: 0218-40network-allow-persistent-interface-names.patch
+Patch219: 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch
+Patch220: 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch
+Patch221: 0221-95fcoe-Add-shutdown-script.patch
+Patch222: 0222-90dm-Fixup-shutdown-script.patch
+Patch223: 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch
# SUSE-specific fixes
Patch300: 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch
Patch301: 0301-include_sysconfig_language.patch
Patch302: 0302-Revert-90multipath-add-hostonly-multipath.conf-in-ca.patch
-Patch211: 0211-fix_multipath_check_hostonly.patch
+Patch303: 0303-fix_multipath_check_hostonly.patch
+Patch304: 0304-90multipath-Start-daemon-after-udev-settle.patch
+Patch305: 0305-90multipath-load-dm_multipath-module-during-startup.patch
+Patch306: 0306-90multipath-add-shutdown-script.patch
# New features/improvements
Patch402: 0402-driver-fail-summary.patch
@@ -311,11 +324,24 @@
%patch210 -p1
%patch212 -p1
%patch213 -p1
+%patch214 -p1
+%patch215 -p1
+%patch216 -p1
+%patch217 -p1
+%patch218 -p1
+%patch219 -p1
+%patch220 -p1
+%patch221 -p1
+%patch222 -p1
+%patch223 -p1
%patch300 -p1
%patch301 -p1
%patch302 -p1
-%patch211 -p1
+%patch303 -p1
+%patch304 -p1
+%patch305 -p1
+%patch306 -p1
%patch402 -p1
%patch403 -p1
@@ -556,9 +582,11 @@
# executable fixups
%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/90livenet/livenet-generator.sh
+%attr(0755,root,root) %{dracutlibdir}/modules.d/90multipath/multipath-shutdown.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/parse-dcssblk.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/module-setup.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/cleanup-fcoe.sh
+%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/stop-fcoe.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/module-setup.sh
++++++ 0053-01fips-fixup-loading-issues.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,5 +1,5 @@
-From c0fd9c31e9044b99edb850c4af229887b616e828 Mon Sep 17 00:00:00 2001
-From: Hannes Reinecke
+From a15945f1cd7cac0ad472807ca7979726dd34288b Mon Sep 17 00:00:00 2001
+From: Marcus Meissner
Date: Mon, 2 Jun 2014 15:02:04 +0200
Subject: [PATCH] 01fips: fixup loading issues
@@ -10,13 +10,13 @@
Signed-off-by: Marcus Meissner
---
modules.d/01fips/fips.sh | 12 ++++++++++++
- modules.d/01fips/module-setup.sh | 12 +++++++++---
- 2 files changed, 21 insertions(+), 3 deletions(-)
+ modules.d/01fips/module-setup.sh | 6 +++++-
+ 2 files changed, 17 insertions(+), 1 deletion(-)
-Index: dracut-042/modules.d/01fips/fips.sh
-===================================================================
---- dracut-042.orig/modules.d/01fips/fips.sh 2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/modules.d/01fips/fips.sh 2015-06-24 18:02:07.817284113 +0200
+diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
+index 6acdf62..835f520 100755
+--- a/modules.d/01fips/fips.sh
++++ b/modules.d/01fips/fips.sh
@@ -98,6 +98,18 @@ do_fips()
_found=1
break
@@ -36,16 +36,16 @@
[ "$_found" = "0" ] && return 1
fi
fi
-Index: dracut-042/modules.d/01fips/module-setup.sh
-===================================================================
---- dracut-042.orig/modules.d/01fips/module-setup.sh 2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/modules.d/01fips/module-setup.sh 2015-06-24 18:02:07.817284113 +0200
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 7278347..18c8377 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
@@ -19,6 +19,8 @@ installkernel() {
_fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
_fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
_fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390"
-+ _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
-+ _fipsmodules+="ghash-clmulni-intel "
++ _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
++ _fipsmodules+="ghash-clmulni-intel "
mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
@@ -60,3 +60,6 @@
inst_simple /etc/system-fips
}
+--
+2.6.6
+
++++++ 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,4 +1,4 @@
-From f0c3f53ee00d1934a0df3f86c897a2ca51df86a0 Mon Sep 17 00:00:00 2001
+From 58f937144d9f206c06052791456599e48c37c417 Mon Sep 17 00:00:00 2001
From: Marcus Meissner
Date: Fri, 18 Jul 2014 15:53:22 +0200
Subject: 01fips: Add drbg module to force loaded modules
@@ -7,19 +7,22 @@
Signed-off-by: Marcus Meissner
---
- modules.d/01fips/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ modules.d/01fips/module-setup.sh | 2 ++
+ 1 file changed, 2 insertions(+)
-Index: dracut-042/modules.d/01fips/module-setup.sh
-===================================================================
---- dracut-042.orig/modules.d/01fips/module-setup.sh 2015-06-24 18:02:08.453320321 +0200
-+++ dracut-042/modules.d/01fips/module-setup.sh 2015-06-24 18:02:23.422172483 +0200
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 0e90246..04d5113 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
@@ -22,6 +22,8 @@ installkernel() {
- _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
- _fipsmodules+="ghash-clmulni-intel "
+ _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
+ _fipsmodules+="ghash-clmulni-intel "
+ _fipsmodules+="drbg"
+
mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
for _mod in $_fipsmodules; do
+--
+2.6.6
+
++++++ 0128-90lvm-Install-dm-snapshot-module.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,17 @@
-Index: dracut-043/modules.d/90lvm/module-setup.sh
-===================================================================
---- dracut-043.orig/modules.d/90lvm/module-setup.sh 2015-06-15 12:27:21.000000000 +0200
-+++ dracut-043/modules.d/90lvm/module-setup.sh 2015-10-14 14:50:35.699797733 +0200
+From 68b8183fc65c2ff1c7d178e782ea5bff7be74d70 Mon Sep 17 00:00:00 2001
+From: Thomas Renninger
+Date: Wed, 4 May 2016 13:32:56 +0200
+Subject: 90lvm: Install dm-snapshot module
+
+Signed-off-by: Thomas Renninger
+---
+ modules.d/90lvm/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
+index c4db779..6ca4ee4 100755
+--- a/modules.d/90lvm/module-setup.sh
++++ b/modules.d/90lvm/module-setup.sh
@@ -43,7 +43,7 @@ cmdline() {
}
@@ -11,3 +21,6 @@
}
# called by dracut
+--
+2.6.6
+
++++++ 0133-Allow-multiple-configurations-per-network-interface-.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -51,7 +51,7 @@
- cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
-
+ # copy resolv.conf if it doesn't exist yet, modify otherwise
-+ if [ -e /tmp/net.$netif.resolv.conf.ipv${1:1:1} ] && [ ! -e /etc/resolv.conf ]; then
++ if [ -e /tmp/net.$netif.resolv.conf.ipv${1:1:1} ] && [ ! -e /etc/resolv.conf ]; then
+ cp -f /tmp/net.$netif.resolv.conf.ipv${1:1:1} /etc/resolv.conf
+ else
+ if [ -n "$(sed -n '/^search .*$/p' /etc/resolv.conf)" ]; then
@@ -65,7 +65,7 @@
+ done
+ fi >> /etc/resolv.conf
+ fi
-+
++
info "DHCP is finished successfully"
return 0
}
@@ -140,7 +140,7 @@
ip_to_var $p
# skip ibft
[ "$autoconf" = "ibft" ] && continue
-+
++
+ # skip if same configuration appears twice
+ while read line
+ do
++++++ 0138-fips_add_aesni-intel.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,13 +1,28 @@
-Index: dracut-042/modules.d/01fips/module-setup.sh
-===================================================================
---- dracut-042.orig/modules.d/01fips/module-setup.sh 2015-06-26 09:52:08.837700391 +0200
-+++ dracut-042/modules.d/01fips/module-setup.sh 2015-06-26 09:53:16.613565464 +0200
+From d74cd280562cc316cbf94db71cb30fd935d26b8b Mon Sep 17 00:00:00 2001
+From: Marcus Meissner
+Date: Wed, 4 May 2016 13:02:50 +0200
+Subject: 01fips: Put aesni-intel into the initrd for FIPS usage
+
+References: bsc#914126
+
+Signed-off-by: Marcus Meissner
+---
+ modules.d/01fips/module-setup.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
+index 7e20b21..2aa9f4f 100755
+--- a/modules.d/01fips/module-setup.sh
++++ b/modules.d/01fips/module-setup.sh
@@ -20,7 +20,7 @@ installkernel() {
_fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
_fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390"
- _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
-- _fipsmodules+="ghash-clmulni-intel "
-+ _fipsmodules+="ghash-clmulni-intel aesni-intel "
+ _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
+- _fipsmodules+="ghash-clmulni-intel "
++ _fipsmodules+="ghash-clmulni-intel aesni-intel"
_fipsmodules+="drbg"
+--
+2.6.6
+
++++++ 0139-fips-kernel-4.4-fixes.patch ++++++
From 2477f53068b4a59af89b2ad89dd2fa174eab7db3 Mon Sep 17 00:00:00 2001
From: Marcus Meissner
Date: Tue, 23 Aug 2016 12:26:00 +0200
Subject: 01fips: Adjust kernel module list for SLES12 SP2
Adjust the kernel module list to match the SLES12 SP2 kernel.
References: bsc#976577
Signed-off-by: Marcus Meissner
---
modules.d/01fips/fips.sh | 1 +
modules.d/01fips/module-setup.sh | 21 +++++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 1cd9852..f33481a 100755
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -103,6 +103,7 @@ do_fips()
-o "$_module" != "${_module%-ssse3}" \
-o "$_module" != "${_module%-x86_64}" \
-o "$_module" != "${_module%z90}" \
+ -o "$_module" != "${_module%s390}" \
]; then
_found=1
fi
diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh
index 2aa9f4f..0bca7a1 100755
--- a/modules.d/01fips/module-setup.sh
+++ b/modules.d/01fips/module-setup.sh
@@ -13,16 +13,17 @@ depends() {
# called by dracut
installkernel() {
local _fipsmodules _mod
- _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 authenc authencesn blowfish camellia cast6 cbc ccm "
- _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg "
- _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 "
- _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic "
- _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib"
- _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390"
- _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
- _fipsmodules+="ghash-clmulni-intel aesni-intel"
-
- _fipsmodules+="drbg"
+ _fipsmodules="ansi_cprng arc4 authenc ccm "
+ _fipsmodules+="ctr cts deflate drbg "
+ _fipsmodules+="ecb fcrypt gcm ghash_generic khazad md4 michael_mic rmd128 "
+ _fipsmodules+="rmd160 rmd256 rmd320 seed "
+ _fipsmodules+="sha512_generic tcrypt tea wp512 xts zlib "
+ _fipsmodules+="aes_s390 des_s390 sha256_s390 ghash_s390 sha1_s390 sha512_s390 "
+ _fipsmodules+="gf128mul "
+ _fipsmodules+="cmac vmac xcbc salsa20_generic salsa20_x86_64 camellia_generic camellia_x86_64 pcbc tgr192 anubis "
+ _fipsmodules+="cast6_generic cast5_generic cast_common sha512_ssse3 serpent_sse2_x86_64 serpent_generic twofish_generic "
+ _fipsmodules+="ablk_helper cryptd twofish_x86_64_3way lrw glue_helper twofish_x86_64 twofish_common blowfish_generic "
+ _fipsmodules+="blowfish_x86_64 blowfish_common des_generic "
mkdir -m 0755 -p "${initdir}/etc/modprobe.d"
--
2.6.6
++++++ 0168-remove_plymouth_logo_file.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,21 @@
-Index: dracut-042/modules.d/50plymouth/plymouth-populate-initrd.sh
-===================================================================
---- dracut-042.orig/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-06-24 18:02:34.814821053 +0200
+From 280d52085fe2876bc08ce1dcdbf1522f8861801c Mon Sep 17 00:00:00 2001
+From: Shawn W Dunn
+Date: Tue, 23 Aug 2016 13:16:20 +0200
+Subject: 50plymouth: remove PLYMOUTH_LOGO_FILE
+
+Remove PLYMOUTH_LOGO_FILE from plymouth-populate-initrd.sh
+
+References: bnc#910952
+
+Signed-off-by: Shawn W Dunn
+---
+ modules.d/50plymouth/plymouth-populate-initrd.sh | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/modules.d/50plymouth/plymouth-populate-initrd.sh b/modules.d/50plymouth/plymouth-populate-initrd.sh
+index 6c184ac..3294878 100755
+--- a/modules.d/50plymouth/plymouth-populate-initrd.sh
++++ b/modules.d/50plymouth/plymouth-populate-initrd.sh
@@ -1,10 +1,8 @@
#!/bin/bash
@@ -13,3 +27,6 @@
/etc/system-release
mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
+--
+2.6.6
+
++++++ 0169-network_set_mtu_macaddr_for_dhcp.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,19 @@
-Index: dracut-044/modules.d/40network/ifup.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/ifup.sh
-+++ dracut-044/modules.d/40network/ifup.sh
+From 36691b5e707fca03d8a31b0c8a30e498465fbc1c Mon Sep 17 00:00:00 2001
+From: Pawel Wieczorkiewicz
+Date: Tue, 23 Aug 2016 12:29:03 +0200
+Subject: Set MTU and LLADDR for DHCP if specified
+
+References: boo#959803
+
+Signed-off-by: Pawel Wieczorkiewicz
+---
+ modules.d/40network/ifup.sh | 52 ++++++++++++++++++++++++++++-----------------
+ 1 file changed, 32 insertions(+), 20 deletions(-)
+
+diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
+index 0aaea72..e101b52 100755
+--- a/modules.d/40network/ifup.sh
++++ b/modules.d/40network/ifup.sh
@@ -90,7 +90,7 @@ else
fi
@@ -89,3 +101,6 @@
case "$autoconf" in
dhcp6)
load_ipv6
+--
+2.6.6
+
++++++ 0170-iscsi-skip-ibft-invalid-dhcp.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,19 @@
-Index: dracut-044/modules.d/40network/net-lib.sh
-===================================================================
---- dracut-044.orig/modules.d/40network/net-lib.sh 2016-04-11 17:44:20.892837133 +0200
-+++ dracut-044/modules.d/40network/net-lib.sh 2016-04-11 17:44:21.292859774 +0200
+From e5d14a8adbfc875517e5d873bea18bf9d997b91f Mon Sep 17 00:00:00 2001
+From: Thomas Renninger
+Date: Tue, 23 Aug 2016 12:30:21 +0200
+Subject: 40network: fixup invalid DHCP setting for iBFT
+
+References: bsc#953361
+
+Signed-off-by: Thomas Renninger
+---
+ modules.d/40network/net-lib.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
+index 0fb594c..09aebb3 100755
+--- a/modules.d/40network/net-lib.sh
++++ b/modules.d/40network/net-lib.sh
@@ -287,7 +287,7 @@ ibft_to_cmdline() {
;;
esac
@@ -11,3 +23,6 @@
if [ "$family" = "ipv6" ] ; then
echo "ip=$dev:dhcp6"
else
+--
+2.6.6
+
++++++ 0180-i18n_add_correct_fontmaps.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,19 @@
-Index: dracut-043/modules.d/10i18n/module-setup.sh
-===================================================================
---- dracut-043.orig/modules.d/10i18n/module-setup.sh
-+++ dracut-043/modules.d/10i18n/module-setup.sh
+From 5f56e6a34ddbc27eee6f7fbe5776bd23629b2e4d Mon Sep 17 00:00:00 2001
+From: Fabian Vogt
+Date: Wed, 4 May 2016 13:08:19 +0200
+Subject: 10i18n: Add correct fontmaps
+
+References: bsc#943312, bsc#932981
+
+Signed-off-by: Fabian Vogt
+---
+ modules.d/10i18n/module-setup.sh | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index 398d02b..4fd0b26 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
@@ -196,7 +196,11 @@ install() {
if [[ ${FONT_MAP} ]]
then
@@ -15,3 +27,6 @@
fi
if [[ ${FONT_UNIMAP} ]]
+--
+2.6.6
+
++++++ 0196-ibft-wait-for-session-on-all-paths.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,19 @@
-Index: dracut-044/modules.d/95iscsi/iscsiroot.sh
-===================================================================
---- dracut-044.orig/modules.d/95iscsi/iscsiroot.sh 2016-04-14 15:20:04.089991822 +0200
-+++ dracut-044/modules.d/95iscsi/iscsiroot.sh 2016-04-14 15:22:50.683407266 +0200
+From 3944cdfd4d99c3d7cd8e801f786e75ed6d254e51 Mon Sep 17 00:00:00 2001
+From: Thomas Renninger
+Date: Tue, 23 Aug 2016 12:33:34 +0200
+Subject: 95iscsi: Wait for session on all paths
+
+References: bsc#951003
+
+Signed-off-by: Thomas Renninger
+---
+ modules.d/95iscsi/iscsiroot.sh | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
+index 4412188..6ef6276 100755
+--- a/modules.d/95iscsi/iscsiroot.sh
++++ b/modules.d/95iscsi/iscsiroot.sh
@@ -51,11 +51,23 @@ set_login_retries() {
handle_firmware()
@@ -26,3 +38,6 @@
if ! iscsiadm -m fw -l; then
warn "iscsiadm: Log-in to iscsi target failed"
fi
+--
+2.6.6
+
++++++ 0201-fix_nfs_with_ip_instead_of_hostname.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,8 +1,18 @@
-Index: dracut-041/modules.d/95nfs/module-setup.sh
-===================================================================
---- dracut-041.orig/modules.d/95nfs/module-setup.sh 2015-05-20 13:37:53.910262273 +0200
-+++ dracut-041/modules.d/95nfs/module-setup.sh 2015-05-21 16:16:35.742683551 +0200
-@@ -51,9 +51,9 @@
+From 7b4b832aded41e25cebbb8807b8e60bf58fd122e Mon Sep 17 00:00:00 2001
+From: Thomas Renninger
+Date: Wed, 4 May 2016 13:33:43 +0200
+Subject: 95nfs: Fix mount if IPv4 address is used in /etc/fstab
+
+Signed-off-by: Thomas Renninger
+---
+ modules.d/95nfs/module-setup.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
+index dc97aba..6644c07 100755
+--- a/modules.d/95nfs/module-setup.sh
++++ b/modules.d/95nfs/module-setup.sh
+@@ -51,9 +51,9 @@ cmdline() {
### ip= ###
if [[ $nfs_device = [0-9]*\.[0-9]*\.[0-9]*.[0-9]* ]] || [[ $nfs_device = \[.*\] ]]; then
@@ -14,3 +24,6 @@
nfs_address=${lookup##* }
fi
ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^ ]*\).*/\1/p')
+--
+2.6.6
+
++++++ 0213-Fix-wrong-keymap-inclusion.patch ++++++
From 234283235ba52a50b84b396b85ff8cf6e16d80a0 Mon Sep 17 00:00:00 2001
From: Fabian Vogt
Date: Fri, 26 Aug 2016 09:44:05 +0200
Subject: [PATCH] Fix wrong keymap inclusion
For MAP=lt, dracut would choose lt.std.map instead of lt.map.
References: bsc#942896
---
modules.d/10i18n/module-setup.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
index 4fd0b26..e5bf5eb 100755
--- a/modules.d/10i18n/module-setup.sh
+++ b/modules.d/10i18n/module-setup.sh
@@ -30,8 +30,9 @@ install() {
# This is from 10redhat-i18n.
findkeymap () {
local MAP=$1
+ local MAPNAME=${1%.map*}
[[ ! -f $MAP ]] && \
- MAP=$(find ${kbddir}/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1)
+ MAP=$(find ${kbddir}/keymaps -type f -name ${MAPNAME} -o -name ${MAPNAME}.map -o -name ${MAPNAME}.map.\* | head -n1)
[[ " $KEYMAPS " = *" $MAP "* ]] && return
KEYMAPS="$KEYMAPS $MAP"
case $MAP in
--
2.6.6
++++++ 0214-95fcoe-Do-not-overwrite-FCoE-configuration.patch ++++++
From 581b48e2e171f1afb01b89a9a4089400d9b20829 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Tue, 16 Aug 2016 13:26:07 +0200
Subject: [PATCH] 95fcoe: Do not overwrite FCoE configuration
If the installation already has a FCoE configuration we should
not attempt to overwrite it but rather use the pre-defined
configuration.
References: bsc#993861
Signed-off-by: Hannes Reinecke
---
modules.d/95fcoe/fcoe-up.sh | 1 +
modules.d/95fcoe/module-setup.sh | 2 ++
2 files changed, 3 insertions(+)
diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
index a525ade..662b21a 100755
--- a/modules.d/95fcoe/fcoe-up.sh
+++ b/modules.d/95fcoe/fcoe-up.sh
@@ -31,6 +31,7 @@ netdriver=$(readlink -f /sys/class/net/$netif/device/driver)
netdriver=${netdriver##*/}
write_fcoemon_cfg() {
+ [ -f /etc/fcoe/cfg-$netif ] && return
echo FCOE_ENABLE=\"yes\" > /etc/fcoe/cfg-$netif
if [ "$dcb" = "dcb" ]; then
echo DCB_REQUIRED=\"yes\" >> /etc/fcoe/cfg-$netif
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index 059bfde..a78516d 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -77,6 +77,8 @@ install() {
local _fcoeconf=$(cmdline)
[[ $_fcoeconf ]] && printf "%s\n" "$_fcoeconf" >> "${initdir}/etc/cmdline.d/95fcoe.conf"
fi
+ inst_multiple /etc/fcoe/cfg-*
+
inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up"
inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd"
inst "$moddir/fcoe-genrules.sh" "/sbin/fcoe-genrules.sh"
--
2.6.6
++++++ 0215-95fcoe-Do-not-complain-about-missing-etc-hba.conf.patch ++++++
From 46736da0be28e579b53ac3c0dd982f3765d48f4a Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Tue, 23 Aug 2016 14:09:12 +0200
Subject: [PATCH] 95fcoe: Do not complain about missing /etc/hba.conf
The file '/etc/hba.conf' got dropped by an updated fcoe-utils
package, so do not complain if it doesn't exist.
References: bsc#980539
Signed-off-by: Hannes Reinecke
---
modules.d/95fcoe/module-setup.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index a78516d..d08e917 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -67,8 +67,10 @@ cmdline() {
# called by dracut
install() {
inst_multiple ip dcbtool fipvlan lldpad readlink lldptool fcoemon fcoeadm
- inst_libdir_file 'libhbalinux.so*'
- inst "/etc/hba.conf" "/etc/hba.conf"
+ if [ -f "/etc/hba.conf" ] ; then
+ inst_libdir_file 'libhbalinux.so*'
+ inst "/etc/hba.conf" "/etc/hba.conf"
+ fi
mkdir -m 0755 -p "$initdir/var/lib/lldpad"
mkdir -m 0755 -p "$initdir/etc/fcoe"
--
2.6.6
++++++ 0216-95fcoe-silence-lldpad-warnings.patch ++++++
From 4d9ec023b6c4a20cc7ffc6ea4ccf86b008a3cbcf Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Tue, 23 Aug 2016 14:35:04 +0200
Subject: [PATCH] 95fcoe: silence lldpad warnings
From 77a524b3659529b14abfdb574094b92216b59af5 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Wed, 24 Aug 2016 08:32:04 +0200
Subject: [PATCH] 95fcoe: Allow to specify the FCoE mode via the fcoe=
When lldpad is not running, any calls to 'dcbtool' will be printing
out a warning. As it perfectly legit to have FCoE running without
DCB we should not be printing out the error.
Signed-off-by: Hannes Reinecke
---
modules.d/95fcoe/module-setup.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index d08e917..18c00b3 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -48,11 +48,11 @@ cmdline() {
d=$(cd -P $c; echo $PWD)
i=${d%/*}
read mac < ${i}/address
- s=$(dcbtool gc ${i##*/} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
+ s=$(dcbtool gc ${i##*/} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
if [ -z "$s" ] ; then
p=$(get_vlan_parent ${i})
if [ "$p" ] ; then
- s=$(dcbtool gc ${p} dcb | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
+ s=$(dcbtool gc ${p} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
fi
fi
if [ "$s" = "on" ] ; then
--
2.6.6
++++++ 0217-95fcoe-Allow-to-specify-the-FCoE-mode-via-the-fcoe-p.patch ++++++
parameter
FCoE can run in Fabric (ie FCF) or VN2VN mode, so we should allowing
to set this parameter from the commandline, too.
Signed-off-by: Hannes Reinecke
---
dracut.cmdline.7.asc | 8 +++++---
modules.d/95fcoe/fcoe-genrules.sh | 4 ++--
modules.d/95fcoe/fcoe-up.sh | 9 +++++++--
modules.d/95fcoe/module-setup.sh | 8 +++++++-
modules.d/95fcoe/parse-fcoe.sh | 22 ++++++++++++++++++----
5 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index 7368aa1..b885946 100644
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -746,10 +746,12 @@ iscsistart -b --param node.session.timeo.replacement_timeout=30
FCoE
~~~~
-**fcoe=**____:__{dcb|nodcb}__::
+**fcoe=**____:__{dcb|nodcb}__:__{fabric|vn2vn}__::
Try to connect to a FCoE SAN through the NIC specified by _<interface>_ or
- _<MAC>_ or EDD settings. For the second argument, currently only nodcb is
- supported. This parameter can be specified multiple times.
+ _<MAC>_ or EDD settings. The second argument specifies if DCB
+ should be used. The optional third argument specifies whether
+ fabric or VN2VN mode should be used.
+ This parameter can be specified multiple times.
+
NOTE: letters in the MAC-address must be lowercase!
diff --git a/modules.d/95fcoe/fcoe-genrules.sh b/modules.d/95fcoe/fcoe-genrules.sh
index eb58601..af15a58 100755
--- a/modules.d/95fcoe/fcoe-genrules.sh
+++ b/modules.d/95fcoe/fcoe-genrules.sh
@@ -7,8 +7,8 @@
# Write udev rules
{
if [ -n "$fcoe_mac" ] ; then
- printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="/sbin/initqueue --onetime --unique --name fcoe-up-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s"\n' "$fcoe_mac" "$fcoe_dcb"
+ printf 'ACTION=="add", SUBSYSTEM=="net", ATTR{address}=="%s", RUN+="/sbin/initqueue --onetime --unique --name fcoe-up-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s"\n' "$fcoe_mac" "$fcoe_dcb" "$fcoe_mode"
else
- printf 'ACTION=="add", SUBSYSTEM=="net", NAME=="%s", RUN+="/sbin/initqueue --onetime --unique --name fcoe-up-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s"\n' "$fcoe_interface" "$fcoe_dcb"
+ printf 'ACTION=="add", SUBSYSTEM=="net", NAME=="%s", RUN+="/sbin/initqueue --onetime --unique --name fcoe-up-$env{INTERFACE} /sbin/fcoe-up $env{INTERFACE} %s"\n' "$fcoe_interface" "$fcoe_dcb" "$fcoe_mode"
fi
} >> /etc/udev/rules.d/92-fcoe.rules
diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
index 662b21a..ffcc4e3 100755
--- a/modules.d/95fcoe/fcoe-up.sh
+++ b/modules.d/95fcoe/fcoe-up.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
# We get called like this:
-# fcoe-up <network-device>
+# fcoe-up <network-device>
#
# Note currently only nodcb is supported, the dcb option is reserved for
# future use.
@@ -15,6 +15,7 @@ type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
netif=$1
dcb=$2
+mode=$3
vlan="yes"
iflink=$(cat /sys/class/net/$netif/iflink)
@@ -43,7 +44,11 @@ write_fcoemon_cfg() {
else
echo AUTO_VLAN=\"no\" >> /etc/fcoe/cfg-$netif
fi
- echo MODE=\"fabric\" >> /etc/fcoe/cfg-$netif
+ if [ "$mode" = "vn2vn" ] ; then
+ echo MODE=\"vn2vn\" >> /etc/fcoe/cfg-$netif
+ else
+ echo MODE=\"fabric\" >> /etc/fcoe/cfg-$netif
+ fi
}
if [ "$netdriver" = "bnx2x" ]; then
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index 18c00b3..2a5c71a 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -44,7 +44,13 @@ cmdline() {
for c in /sys/bus/fcoe/devices/ctlr_* ; do
[ -L $c ] || continue
read enabled < $c/enabled
+ read mode < $c/mode
[ $enabled -eq 0 ] && continue
+ if [ $mode = "VN2VN" ] ; then
+ mode="vn2vn"
+ else
+ mode="fabric"
+ fi
d=$(cd -P $c; echo $PWD)
i=${d%/*}
read mac < ${i}/address
@@ -60,7 +66,7 @@ cmdline() {
else
dcb="nodcb"
fi
- echo "fcoe=${mac}:${dcb}"
+ echo "fcoe=${mac}:${dcb}:${mode}"
done
}
diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh
index 9f47184..75cca9a 100755
--- a/modules.d/95fcoe/parse-fcoe.sh
+++ b/modules.d/95fcoe/parse-fcoe.sh
@@ -1,8 +1,8 @@
#!/bin/sh
#
# Supported formats:
-# fcoe=<networkdevice>:
-# fcoe=<macaddress>:
+# fcoe=<networkdevice>::
+# fcoe=<macaddress>::
#
# Note currently only nodcb is supported, the dcb option is reserved for
# future use.
@@ -10,8 +10,8 @@
# Note letters in the macaddress must be lowercase!
#
# Examples:
-# fcoe=eth0:nodcb
-# fcoe=4a:3f:4c:04:f8:d7:nodcb
+# fcoe=eth0:nodcb:vn2vn
+# fcoe=4a:3f:4c:04:f8:d7:nodcb:fabric
[ -z "$fcoe" ] && fcoe=$(getarg fcoe=)
@@ -32,11 +32,25 @@ parse_fcoe_opts() {
2)
fcoe_interface=$1
fcoe_dcb=$2
+ fcoe_mode="fabric"
+ return 0
+ ;;
+ 3)
+ fcoe_interface=$1
+ fcoe_dcb=$2
+ fcoe_mode=$3
return 0
;;
7)
fcoe_mac=$1:$2:$3:$4:$5:$6
fcoe_dcb=$7
+ fcoe_mode="fabric"
+ return 0
+ ;;
+ 8)
+ fcoe_mac=$1:$2:$3:$4:$5:$6
+ fcoe_dcb=$7
+ fcoe_mode=$8
return 0
;;
*)
--
2.6.6
++++++ 0218-40network-allow-persistent-interface-names.patch ++++++
From 47831cf386dd4d49c2b56f3bbbaf719348b9862f Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Wed, 24 Aug 2016 15:12:52 +0200
Subject: [PATCH] 40network: allow persistent interface names
We are using persistent interface names even for kernel device
names on SLES, so we should be removing the warning.
References: bsc#995284
Signed-off-by: Hannes Reinecke
---
modules.d/40network/net-lib.sh | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
index 09aebb3..b19c177 100755
--- a/modules.d/40network/net-lib.sh
+++ b/modules.d/40network/net-lib.sh
@@ -572,15 +572,6 @@ parse_ifname_opts() {
;;
esac
- case $ifname_if in
- eth[0-9]|eth[0-9][0-9]|eth[0-9][0-9][0-9]|eth[0-9][0-9][0-9][0-9])
- warn "ifname=$ifname_if uses the kernel name space for interfaces"
- warn "This can fail for multiple network interfaces and is discouraged!"
- warn "Please use a custom name like \"netboot\" or \"bluesocket\""
- warn "or use biosdevname and no ifname= at all."
- ;;
- esac
-
}
# some network driver need long time to initialize, wait before it's ready.
--
2.6.6
++++++ 0219-95fcoe-use-interface-names-instead-of-MAC-addresses.patch ++++++
From 4f19de16df2746b0b742bfbecfb493728a150c86 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Wed, 24 Aug 2016 15:14:31 +0200
Subject: [PATCH] 95fcoe: use interface names instead of MAC addresses
Now that we are using persistent network names we can switch
to using the interface names when specifying the fcoe configuration.
With that we can print the fcoe configuration only once.
Signed-off-by: Hannes Reinecke
---
modules.d/95fcoe/module-setup.sh | 60 +++++++++++++++++++++-------------------
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index 2a5c71a..acc611d 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -40,34 +40,38 @@ get_vlan_parent() {
# called by dracut
cmdline() {
-
- for c in /sys/bus/fcoe/devices/ctlr_* ; do
- [ -L $c ] || continue
- read enabled < $c/enabled
- read mode < $c/mode
- [ $enabled -eq 0 ] && continue
- if [ $mode = "VN2VN" ] ; then
- mode="vn2vn"
- else
- mode="fabric"
- fi
- d=$(cd -P $c; echo $PWD)
- i=${d%/*}
- read mac < ${i}/address
- s=$(dcbtool gc ${i##*/} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
- if [ -z "$s" ] ; then
- p=$(get_vlan_parent ${i})
- if [ "$p" ] ; then
- s=$(dcbtool gc ${p} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
- fi
- fi
- if [ "$s" = "on" ] ; then
- dcb="dcb"
- else
- dcb="nodcb"
- fi
- echo "fcoe=${mac}:${dcb}:${mode}"
- done
+ {
+ for c in /sys/bus/fcoe/devices/ctlr_* ; do
+ [ -L $c ] || continue
+ read enabled < $c/enabled
+ read mode < $c/mode
+ [ $enabled -eq 0 ] && continue
+ if [ $mode = "VN2VN" ] ; then
+ mode="vn2vn"
+ else
+ mode="fabric"
+ fi
+ d=$(cd -P $c; echo $PWD)
+ i=${d%/*}
+ ifname=${i##*/}
+ read mac < ${i}/address
+ s=$(dcbtool gc ${i##*/} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
+ if [ -z "$s" ] ; then
+ p=$(get_vlan_parent ${i})
+ if [ "$p" ] ; then
+ s=$(dcbtool gc ${p} dcb 2>/dev/null | sed -n 's/^DCB State:\t*\(.*\)/\1/p')
+ ifname=${p##*/}
+ fi
+ fi
+ if [ "$s" = "on" ] ; then
+ dcb="dcb"
+ else
+ dcb="nodcb"
+ fi
+ echo "ifname=${ifname}:${mac}"
+ echo "fcoe=${ifname}:${dcb}:${mode}"
+ done
+ } | sort | uniq
}
# called by dracut
--
2.6.6
++++++ 0220-95fcoe-always-set-AUTO_VLAN-for-fcoemon.patch ++++++
From fdbb581a9df74db58c306141aca24dc824e72dec Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Wed, 24 Aug 2016 12:26:04 +0200
Subject: [PATCH] 95fcoe: always set AUTO_VLAN for fcoemon
fcoemon is well capable of figuring out whether a vlan should
be used, so there's no need to disable the AUTO_VLAN feature.
References: bsc#995019
Signed-off-by: Hannes Reinecke
---
modules.d/95fcoe/fcoe-up.sh | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/modules.d/95fcoe/fcoe-up.sh b/modules.d/95fcoe/fcoe-up.sh
index ffcc4e3..102f9d3 100755
--- a/modules.d/95fcoe/fcoe-up.sh
+++ b/modules.d/95fcoe/fcoe-up.sh
@@ -92,13 +92,8 @@ elif [ "$dcb" = "dcb" ]; then
done
sleep 1
-
- write_fcoemon_cfg
- fcoemon --syslog=yes
-else
- vlan="no"
- write_fcoemon_cfg
- fcoemon --syslog=yes
fi
+write_fcoemon_cfg
+fcoemon --syslog=yes
need_shutdown
--
2.6.6
++++++ 0221-95fcoe-Add-shutdown-script.patch ++++++
From 2a5b570b7a6020d63ab6c4cbdb9e926d88b32639 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Thu, 25 Aug 2016 09:36:06 +0200
Subject: [PATCH] 95fcoe: Add shutdown script
We should be disabling the FCoE connection (which triggers sending
a LOGO internally) to logout from the target; this resets the target
and will avoid hitting a busy condition during reboots.
References: bsc#994860
Signed-off-by: Hannes Reinecke
---
modules.d/95fcoe/module-setup.sh | 1 +
modules.d/95fcoe/stop-fcoe.sh | 6 ++++++
2 files changed, 7 insertions(+)
create mode 100755 modules.d/95fcoe/stop-fcoe.sh
diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh
index acc611d..572670c 100755
--- a/modules.d/95fcoe/module-setup.sh
+++ b/modules.d/95fcoe/module-setup.sh
@@ -97,6 +97,7 @@ install() {
inst_hook pre-trigger 03 "$moddir/lldpad.sh"
inst_hook cmdline 99 "$moddir/parse-fcoe.sh"
inst_hook cleanup 90 "$moddir/cleanup-fcoe.sh"
+ inst_hook shutdown 40 "$moddir/stop-fcoe.sh"
dracut_need_initqueue
}
diff --git a/modules.d/95fcoe/stop-fcoe.sh b/modules.d/95fcoe/stop-fcoe.sh
new file mode 100755
index 0000000..d2462b3
--- /dev/null
+++ b/modules.d/95fcoe/stop-fcoe.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for f in /sys/bus/fcoe/devices/ctlr_* ; do
+ [ -e $f ] || continue
+ echo 0 > $f/enabled
+done
--
2.6.6
++++++ 0222-90dm-Fixup-shutdown-script.patch ++++++
From 885b133ecd7913990449e7598526d0965ebc3458 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Thu, 25 Aug 2016 09:28:30 +0200
Subject: [PATCH] 90dm: Fixup shutdown script
When calling the shutdown script we need to take care of traversing
the device-mapper tables, otherwise we might end up trying to remove
a device-mapper device which still has another one stacked on top
and the removal will fail.
References: bsc#994860
Signed-off-by: Hannes Reinecke
---
modules.d/90dm/dm-shutdown.sh | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/modules.d/90dm/dm-shutdown.sh b/modules.d/90dm/dm-shutdown.sh
index 04c89be..0685a68 100755
--- a/modules.d/90dm/dm-shutdown.sh
+++ b/modules.d/90dm/dm-shutdown.sh
@@ -1,11 +1,28 @@
#!/bin/sh
+_remove_dm() {
+ local dev=$1
+ local s
+ local devname
+
+ for s in /sys/block/${dev}/holders/dm-* ; do
+ [ -e ${s} ] || continue
+ _remove_dm ${s##*/}
+ done
+ devname=$(cat /sys/block/${dev}/dm/name)
+ dmsetup -v --noudevsync remove "$devname" || return $?
+ return 0
+}
+
_do_dm_shutdown() {
local ret=0
local final=$1
+ local dev
+
info "Disassembling device-mapper devices"
- for dev in $(dmsetup info -c --noheadings -o name) ; do
- dmsetup -v --noudevsync remove "$dev" || ret=$?
+ for dev in /sys/block/dm-* ; do
+ [ -e ${dev} ] || continue
+ _remove_dm ${dev##*/} || ret=$?
done
if [ "x$final" != "x" ]; then
info "dmsetup ls --tree"
--
2.6.6
++++++ 0223-90dm-fixup-dependency-cycle-between-MD-and-DM-shutdo.patch ++++++
From e35fe0828445a36284b2ba0852247bf6671a2680 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Thu, 25 Aug 2016 09:49:14 +0200
Subject: [PATCH] 90dm: fixup dependency cycle between MD and DM shutdown
DM devices might be located on top of MD devices, so we need to
call the DM shutdown script before MD shutdown. The exception
here are multipath devices, which are below MD devices.
So skip removing multipath devices here to avoid spurious errors.
References: bsc#994860
Signed-off-by: Hannes Reinecke
---
modules.d/90dm/dm-shutdown.sh | 14 ++++++++++++--
modules.d/90dm/module-setup.sh | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/modules.d/90dm/dm-shutdown.sh b/modules.d/90dm/dm-shutdown.sh
index 0685a68..732548b 100755
--- a/modules.d/90dm/dm-shutdown.sh
+++ b/modules.d/90dm/dm-shutdown.sh
@@ -9,8 +9,18 @@ _remove_dm() {
[ -e ${s} ] || continue
_remove_dm ${s##*/}
done
- devname=$(cat /sys/block/${dev}/dm/name)
- dmsetup -v --noudevsync remove "$devname" || return $?
+ # multipath devices might have MD devices on top,
+ # which are removed after this script. So do not
+ # remove those to avoid spurious errors
+ case $(cat /sys/block/${dev}/dm/uuid) in
+ mpath-*)
+ return 0
+ ;;
+ *)
+ devname=$(cat /sys/block/${dev}/dm/name)
+ dmsetup -v --noudevsync remove "$devname" || return $?
+ ;;
+ esac
return 0
}
diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh
index 419e8b1..a5ada46 100755
--- a/modules.d/90dm/module-setup.sh
+++ b/modules.d/90dm/module-setup.sh
@@ -39,6 +39,6 @@ install() {
inst_rules "$moddir/59-persistent-storage-dm.rules"
prepare_udev_rules 59-persistent-storage-dm.rules
- inst_hook shutdown 30 "$moddir/dm-shutdown.sh"
+ inst_hook shutdown 25 "$moddir/dm-shutdown.sh"
}
--
2.6.6
++++++ 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,17 @@
-Index: dracut-044/modules.d/50plymouth/module-setup.sh
-===================================================================
---- dracut-044.orig/modules.d/50plymouth/module-setup.sh
-+++ dracut-044/modules.d/50plymouth/module-setup.sh
+From 9a3027a11ea5bac05c474a85da355e4e74793006 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke
+Date: Wed, 4 May 2016 13:36:34 +0200
+Subject: [PATCH] 50plymouth: don't use dpkg defaults on SUSE
+
+Signed-off-by: Thomas Renninger
+---
+ modules.d/50plymouth/module-setup.sh | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
+index 27dafca..d00f2f1 100755
+--- a/modules.d/50plymouth/module-setup.sh
++++ b/modules.d/50plymouth/module-setup.sh
@@ -3,6 +3,8 @@
# called by dracut
check() {
@@ -25,3 +35,6 @@
[ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth"
if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
+--
+2.6.6
+
++++++ 0301-include_sysconfig_language.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,20 +1,21 @@
+From 64929793cb6f58c865b7d87d241524d9d9cd7a4e Mon Sep 17 00:00:00 2001
From: Fabian Vogt
-Subject: Include /etc/sysconfig/language instead of generating /etc/locale.conf
-References: boo#927250
+Date: Tue, 23 Aug 2016 12:56:08 +0200
+Subject: [PATCH] Include /etc/sysconfig/language instead of generating
+ /etc/locale.conf
- There's a bug in systemd's locale-setup code, ignoring /etc/locale.conf
- Work around it by providing /etc/sysconfig/language directly
- May be the best way to support ROOT_USES_LANG in the initrd properly anyway,
so this patch can be kept even after the original systemd bug is fixed
-
---
- modules.d/10i18n/module-setup.sh | 8 +++++---
+ modules.d/10i18n/module-setup.sh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
-Index: dracut-044/modules.d/10i18n/module-setup.sh
-===================================================================
---- dracut-044.orig/modules.d/10i18n/module-setup.sh
-+++ dracut-044/modules.d/10i18n/module-setup.sh
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index e5bf5eb..d6aab19 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
@@ -25,6 +25,7 @@ install() {
KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps
DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}"
@@ -37,3 +38,6 @@
fi
if dracut_module_included "systemd" && [[ -f ${VCONFIG_CONF} ]]; then
+--
+2.6.6
+
++++++ 0302-Revert-90multipath-add-hostonly-multipath.conf-in-ca.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,8 +1,8 @@
-From c9f18fcc4b7a4b31cc1f68d9e5e1c2d6625871ca Mon Sep 17 00:00:00 2001
+From 269941f54e5cf0c601ae284207cdeab865ccc18d Mon Sep 17 00:00:00 2001
From: Dave Young
Date: Wed, 4 May 2016 12:46:12 +0200
-Subject: Revert '90multipath: add hostonly multipath.conf in case hostonly
- mode'
+Subject: [PATCH] Revert '90multipath: add hostonly multipath.conf in case
+ hostonly mode'
Patch is incompatible with SUSE, which doesn't have mpathconf.
++++++ 0211-fix_multipath_check_hostonly.patch -> 0303-fix_multipath_check_hostonly.patch ++++++
--- /work/SRC/openSUSE:Factory/dracut/0211-fix_multipath_check_hostonly.patch 2016-06-13 21:54:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/0303-fix_multipath_check_hostonly.patch 2016-09-05 21:16:45.000000000 +0200
@@ -1,18 +1,19 @@
+From 72e51c9d9eed05a8a012b944494306eddd92eae4 Mon Sep 17 00:00:00 2001
From: Fabian Vogt
-Subject: Fix warning about multipath if not needed
+Date: Tue, 23 Aug 2016 12:56:21 +0200
+Subject: [PATCH] Fix warning about multipath if not needed
Although no device uses multipath, the module checks
for presence of the multipath binary first, printing a
warning if not present. This patch fixes the wrong ordering.
-
---
- modules.d/90multipath/module-setup.sh | 5 +++--
+ modules.d/90multipath/module-setup.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
-Index: dracut-044/modules.d/90multipath/module-setup.sh
-===================================================================
---- dracut-044.orig/modules.d/90multipath/module-setup.sh 2016-04-19 13:58:59.445320244 +0200
-+++ dracut-044/modules.d/90multipath/module-setup.sh 2016-04-19 13:59:41.467698870 +0200
+diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
+index c2c85c4..d4bd6e1 100755
+--- a/modules.d/90multipath/module-setup.sh
++++ b/modules.d/90multipath/module-setup.sh
@@ -3,8 +3,6 @@
# called by dracut
check() {
@@ -32,3 +33,6 @@
return 0
}
+--
+2.6.6
+
++++++ 0304-90multipath-Start-daemon-after-udev-settle.patch ++++++
From d72902ee8f789ccdb6db0f7fb31b9a3adf06670f Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Wed, 24 Aug 2016 09:05:01 +0200
Subject: [PATCH] 90multipath: Start daemon after udev settle
We need to wait until udev has processed all events, otherwise we'll
risk of misdetecting devices. This might cause a temporary interruption
during which multipath removes a device-mapper device, which then
causes a booting failure.
References: bsc#986734
Signed-off-by: Hannes Reinecke
---
modules.d/90multipath/multipathd.service | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service
index f7bc65f..0f11bd5 100644
--- a/modules.d/90multipath/multipathd.service
+++ b/modules.d/90multipath/multipathd.service
@@ -1,6 +1,8 @@
[Unit]
Description=Device-Mapper Multipath Device Controller
Before=iscsi.service iscsid.service lvm2-activation-early.service
+Wants=systemd-udev-trigger.service systemd-udev-settle.service
+After=systemd-udev-trigger.service systemd-udev-settle.service
DefaultDependencies=no
Conflicts=shutdown.target
ConditionKernelCommandLine=!nompath
--
2.6.6
++++++ 0305-90multipath-load-dm_multipath-module-during-startup.patch ++++++
From 457e1bd3a8707d82aa7b73294be84316b4658c61 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Wed, 24 Aug 2016 12:44:31 +0200
Subject: [PATCH] 90multipath: load dm_multipath module during startup
As the 'multipath' program will be triggered directly from
udev events it will be called before the multipath service
unit has started up. Which means we cannot rely on the
service unit to load the module for us, but we rather
have to do it early before udev is started.
References: bsc#986734
Signed-off-by: Hannes Reinecke
---
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 d4bd6e1..a5db55f 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -30,7 +30,7 @@ depends() {
# called by dracut
cmdline() {
- for m in scsi_dh_alua scsi_dh_emc scsi_dh_rdac ; do
+ for m in scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm_multipath; do
if module_is_host_only $m ; then
printf 'rd.driver.pre=%s ' "$m"
fi
--
2.6.6
++++++ 0306-90multipath-add-shutdown-script.patch ++++++
From 800cfd66abb60fe9524d321df77717435ed96e35 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Thu, 25 Aug 2016 09:33:26 +0200
Subject: [PATCH] 90multipath: add shutdown script
As the device-mapper module is removing all device-mapper tables
during shutdown we need to make sure to disable queuing on the
multipath devices; otherwise there might still be I/O pending
and the removal will fail.
References: bsc#994860
Signed-off-by: Hannes Reinecke
---
modules.d/90multipath/module-setup.sh | 1 +
modules.d/90multipath/multipath-shutdown.sh | 7 +++++++
modules.d/90multipath/multipathd-needshutdown.sh | 9 +++++----
3 files changed, 13 insertions(+), 4 deletions(-)
create mode 100755 modules.d/90multipath/multipath-shutdown.sh
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
index a5db55f..ad257ad 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -114,6 +114,7 @@ install() {
fi
inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
+ inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"
inst_rules 40-multipath.rules 56-multipath.rules \
62-multipath.rules 65-multipath.rules \
diff --git a/modules.d/90multipath/multipath-shutdown.sh b/modules.d/90multipath/multipath-shutdown.sh
new file mode 100755
index 0000000..47e9990
--- /dev/null
+++ b/modules.d/90multipath/multipath-shutdown.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+for i in $(multipath -l -v1); do
+ if ! $(dmsetup table $i | sed -n '/.*queue_if_no_path.*/q1') ; then
+ dmsetup message $i 0 fail_if_no_path
+ fi
+done
diff --git a/modules.d/90multipath/multipathd-needshutdown.sh b/modules.d/90multipath/multipathd-needshutdown.sh
index 214abd3..1d41bf8 100755
--- a/modules.d/90multipath/multipathd-needshutdown.sh
+++ b/modules.d/90multipath/multipathd-needshutdown.sh
@@ -1,7 +1,8 @@
#!/bin/sh
-for i in /dev/mapper/mpath*; do
- [ -b "$i" ] || continue
- need_shutdown
- break
+for i in $(multipath -l -v1); do
+ if $(dmsetup table $i | grep -q queue_if_no_path) ; then
+ need_shutdown
+ break
+ fi
done
--
2.6.6
++++++ 0402-driver-fail-summary.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,4 +1,4 @@
-From 9e0f4d437b55ff17a0c9e3cdca5e1dcdec136ca8 Mon Sep 17 00:00:00 2001
+From 2e176c1a99db334756c91c6c0e10e029993e56c7 Mon Sep 17 00:00:00 2001
From: Fabian Vogt
Date: Tue, 3 Nov 2015 17:25:44 +0100
Subject: [PATCH] Accumulate kernel module installation failures
@@ -15,14 +15,14 @@
Signed-off-by: Fabian Vogt
---
- dracut-init.sh | 11 ++++-------
- dracut.sh | 9 +++++++++
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-Index: dracut-044/dracut-init.sh
-===================================================================
---- dracut-044.orig/dracut-init.sh 2016-04-11 18:19:59.333855978 +0200
-+++ dracut-044/dracut-init.sh 2016-04-11 18:19:59.585870239 +0200
+ dracut-init.sh | 8 +++++---
+ dracut.sh | 15 +++++++++++++++
+ 2 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/dracut-init.sh b/dracut-init.sh
+index 9689c0b..0fda778 100644
+--- a/dracut-init.sh
++++ b/dracut-init.sh
@@ -1084,14 +1084,16 @@ instmods() {
[[ $no_kernel = yes ]] && return
# called [sub]functions inherit _fderr
@@ -59,10 +59,10 @@
fi
}
shift
-Index: dracut-044/dracut.sh
-===================================================================
---- dracut-044.orig/dracut.sh 2016-04-11 18:19:59.429861411 +0200
-+++ dracut-044/dracut.sh 2016-04-11 18:19:59.593870691 +0200
+diff --git a/dracut.sh b/dracut.sh
+index 12b253d..d7dc9ff 100755
+--- a/dracut.sh
++++ b/dracut.sh
@@ -390,6 +390,12 @@ verbosity_mod_l=0
unset kernel
unset outfile
@@ -92,3 +92,6 @@
if (( maxloglvl >= 5 )); then
if [[ $allowlocal ]]; then
"$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img"| ddebug
+--
+2.6.6
+
++++++ 0403-95lunmask-Add-module-to-handle-LUN-masking.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,7 @@
-From 0f353853241e002658a9870419a7930fc3414b18 Mon Sep 17 00:00:00 2001
+From 55adce6c6676c83f9130c3b6e0391bfcb5c92320 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Wed, 11 Nov 2015 12:20:33 +0100
-Subject: 95lunmask: Add module to handle LUN masking
+Subject: [PATCH] 95lunmask: Add module to handle LUN masking
Using the module option 'scsi_mod.scan=manual'
this implements LUN masking by selectively enable only those
@@ -16,13 +16,13 @@
modules.d/95lunmask/parse-lunmask.sh | 40 +++++++++++++++
modules.d/95lunmask/sas_transport_scan_lun.sh | 26 ++++++++++
4 files changed, 162 insertions(+)
- create mode 100644 modules.d/95lunmask/fc_transport_scan_lun.sh
- create mode 100644 modules.d/95lunmask/module-setup.sh
- create mode 100644 modules.d/95lunmask/parse-lunmask.sh
- create mode 100644 modules.d/95lunmask/sas_transport_scan_lun.sh
+ create mode 100755 modules.d/95lunmask/fc_transport_scan_lun.sh
+ create mode 100755 modules.d/95lunmask/module-setup.sh
+ create mode 100755 modules.d/95lunmask/parse-lunmask.sh
+ create mode 100755 modules.d/95lunmask/sas_transport_scan_lun.sh
diff --git a/modules.d/95lunmask/fc_transport_scan_lun.sh b/modules.d/95lunmask/fc_transport_scan_lun.sh
-new file mode 100644
+new file mode 100755
index 0000000..d9f84a3
--- /dev/null
+++ b/modules.d/95lunmask/fc_transport_scan_lun.sh
@@ -54,7 +54,7 @@
+[ -z "$TARGET" ] && exit 1
+echo $CHANNEL $TARGET $LUN > /sys/class/scsi_host/host$HOST/scan
diff --git a/modules.d/95lunmask/module-setup.sh b/modules.d/95lunmask/module-setup.sh
-new file mode 100644
+new file mode 100755
index 0000000..6afaed2
--- /dev/null
+++ b/modules.d/95lunmask/module-setup.sh
@@ -130,7 +130,7 @@
+ fi
+}
diff --git a/modules.d/95lunmask/parse-lunmask.sh b/modules.d/95lunmask/parse-lunmask.sh
-new file mode 100644
+new file mode 100755
index 0000000..6646876
--- /dev/null
+++ b/modules.d/95lunmask/parse-lunmask.sh
@@ -176,7 +176,7 @@
+ )
+done
diff --git a/modules.d/95lunmask/sas_transport_scan_lun.sh b/modules.d/95lunmask/sas_transport_scan_lun.sh
-new file mode 100644
+new file mode 100755
index 0000000..f7702f8
--- /dev/null
+++ b/modules.d/95lunmask/sas_transport_scan_lun.sh
++++++ 0404-dracut-emergency-optionally-print-fs-help.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,4 +1,4 @@
-From 7114191b77be2e979bc7d7a93ba040b91a72b5a9 Mon Sep 17 00:00:00 2001
+From 033e11927e1f7f3d1163ba78dfd5e7a6bad41ee7 Mon Sep 17 00:00:00 2001
From: Mark Fasheh
Date: Fri, 24 Jun 2016 15:11:17 -0700
Subject: [PATCH] dracut-emergency: optionally print fs help
@@ -14,7 +14,7 @@
2 files changed, 8 insertions(+)
diff --git a/dracut-init.sh b/dracut-init.sh
-index fc35d7b..ae6352b 100644
+index 0fda778..c941390 100644
--- a/dracut-init.sh
+++ b/dracut-init.sh
@@ -240,6 +240,12 @@ inst_script() {
@@ -51,5 +51,5 @@
[ -z "$PS1" ] && export PS1="$_name:\${PWD}# "
exec sh -i -l
--
-2.1.4
+2.6.6
++++++ 0500-Reset-IFS-variable.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,7 +1,7 @@
-From bcfdc4522d2f04d0a1fd46d80a8ac7ff357b8bc5 Mon Sep 17 00:00:00 2001
+From bcaa0a11b41765be7cbb92e2641750b5adb8e326 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
Date: Mon, 14 Jul 2014 10:22:31 +0200
-Subject: Reset IFS variable
+Subject: [PATCH] Reset IFS variable
Setting and unsetting the IFS variable is tricky. To be on the
safe side we should always reset the IFS variable to its original
@@ -9,14 +9,15 @@
Signed-off-by: Hannes Reinecke
---
- modules.d/95dasd/parse-dasd.sh | 2 ++
- modules.d/95zfcp/parse-zfcp.sh | 2 ++
- 3 files changed, 6 insertions(+)
+ modules.d/95dasd/parse-dasd.sh | 2 ++
+ modules.d/95dasd_rules/parse-dasd.sh | 8 ++++++--
+ modules.d/95zfcp_rules/parse-zfcp.sh | 4 ++++
+ 3 files changed, 12 insertions(+), 2 deletions(-)
-Index: dracut-044/modules.d/95dasd/parse-dasd.sh
-===================================================================
---- dracut-044.orig/modules.d/95dasd/parse-dasd.sh 2015-11-25 14:22:28.000000000 +0100
-+++ dracut-044/modules.d/95dasd/parse-dasd.sh 2016-04-26 15:12:30.739569930 +0200
+diff --git a/modules.d/95dasd/parse-dasd.sh b/modules.d/95dasd/parse-dasd.sh
+index 35c997c..976bd03 100755
+--- a/modules.d/95dasd/parse-dasd.sh
++++ b/modules.d/95dasd/parse-dasd.sh
@@ -1,8 +1,10 @@
#!/bin/sh
for dasd_arg in $(getargs rd.dasd= -d rd_DASD= DASD=); do
@@ -28,11 +29,11 @@
echo "$@" | normalize_dasd_arg >> /etc/dasd.conf
)
done
-Index: dracut-044/modules.d/95dasd_rules/parse-dasd.sh
-===================================================================
---- dracut-044.orig/modules.d/95dasd_rules/parse-dasd.sh 2016-04-26 15:12:29.575504027 +0200
-+++ dracut-044/modules.d/95dasd_rules/parse-dasd.sh 2016-04-26 15:16:13.780196465 +0200
-@@ -59,8 +59,10 @@ for dasd_arg in $(getargs root=) $(getar
+diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh
+index e1bee62..1cc621f 100755
+--- a/modules.d/95dasd_rules/parse-dasd.sh
++++ b/modules.d/95dasd_rules/parse-dasd.sh
+@@ -59,8 +59,10 @@ for dasd_arg in $(getargs root=) $(getargs resume=); do
;;
esac
if [ -n "$ccw_arg" ] ; then
@@ -71,10 +72,10 @@
for dev in $(seq $(( 16#$start )) $(( 16#$end )) ) ; do
create_udev_rule $(printf "0.0.%04x" "$dev")
done
-Index: dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh
-===================================================================
---- dracut-044.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2016-04-26 15:12:30.051530977 +0200
-+++ dracut-044/modules.d/95zfcp_rules/parse-zfcp.sh 2016-04-26 15:17:31.484595325 +0200
+diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh
+index 77412f7..7d47d35 100755
+--- a/modules.d/95zfcp_rules/parse-zfcp.sh
++++ b/modules.d/95zfcp_rules/parse-zfcp.sh
@@ -53,8 +53,10 @@ fi
for zfcp_arg in $(getargs rd.zfcp); do
@@ -86,7 +87,7 @@
create_udev_rule $1 $2 $3
)
done
-@@ -70,8 +72,10 @@ for zfcp_arg in $(getargs root=) $(getar
+@@ -70,8 +72,10 @@ for zfcp_arg in $(getargs root=) $(getargs resume=); do
;;
esac
if [ -n "$ccw_arg" ] ; then
@@ -97,3 +98,6 @@
_wwpn=${4%:*}
_lun=${4#*:}
create_udev_rule $2 $wwpn $lun
+--
+2.6.6
+
++++++ 0501-dasd_fix_ssid_bigger_zero.patch ++++++
--- /var/tmp/diff_new_pack.CvAkBT/_old 2016-09-05 21:16:50.000000000 +0200
+++ /var/tmp/diff_new_pack.CvAkBT/_new 2016-09-05 21:16:50.000000000 +0200
@@ -1,16 +1,19 @@
+From d8b28c14e3f350acdda42a0cc2c60ce71b9c53a2 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke
-
-Fix DASD with SSID greater than 0
+Date: Tue, 23 Aug 2016 12:56:53 +0200
+Subject: [PATCH] Fix DASD with SSID greater than 0
bsc#989313
Signed-off-by: Thomas Renninger
-
---
modules.d/95dasd_rules/parse-dasd.sh | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
---- a/modules.d/95dasd_rules/parse-dasd.sh
-+++ a/modules.d/95dasd_rules/parse-dasd.sh
+
+diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh
+index 1cc621f..67ed802 100755
+--- a/modules.d/95dasd_rules/parse-dasd.sh
++++ b/modules.d/95dasd_rules/parse-dasd.sh
@@ -84,13 +84,14 @@ for dasd_arg in $(getargs rd.dasd=); do
OLDIFS="$IFS"
IFS="-"
@@ -49,3 +52,5 @@
;;
esac
--
+2.6.6
+