Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2014-04-26 11:44:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2014-04-12
21:33:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-04-26
11:44:58.000000000 +0200
@@ -1,0 +2,20 @@
+Wed Apr 16 09:56:31 CEST 2014 - h...@suse.de
+
+- Enable multipath correctly during booting (bnc#873686)
+ Add: 0022-90multipath-Fixup-service-file-for-booting.patch
+
+-------------------------------------------------------------------
+Mon Apr 14 14:19:49 UTC 2014 - pwieczorkiew...@suse.com
+
+- fix-iscsi-firmware.patch:
+ Fix according to dracut-037 updates (iscsistarted-iscsi:).
+
+-------------------------------------------------------------------
+Mon Apr 14 09:00:26 UTC 2014 - pwieczorkiew...@suse.com
+
+- add_dracuts_network_params_for_iscsi.patch:
+ Add missing dracut's cmdline parameters to make network mandatory
+ and boot using iBFT when present. Without them iBFT booting does
+ not work.
+
+-------------------------------------------------------------------
New:
----
0022-90multipath-Fixup-service-file-for-booting.patch
add_dracuts_network_params_for_iscsi.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200
@@ -57,6 +57,8 @@
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
+Patch34: add_dracuts_network_params_for_iscsi.patch
+Patch35: 0022-90multipath-Fixup-service-file-for-booting.patch
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@@ -118,6 +120,8 @@
%patch31 -p1
%patch32 -p1
%patch33 -p1
+%patch34 -p1
+%patch35 -p1
%build
%configure\
++++++ 0022-90multipath-Fixup-service-file-for-booting.patch ++++++
>From 10eda256afc1f1de0bffa26afdbdcf04394aeeeb Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Wed, 16 Apr 2014 09:35:28 +0200
Subject: 90multipath: Fixup service file for booting
'Type=forking' caused systemd to immediately terminate the
entire process, and not creating any device maps.
So we should be using 'Type=simple' here.
References: bnc#873686
Signed-off-by: Hannes Reinecke <h...@suse.de>
---
modules.d/90multipath/module-setup.sh | 4 ++--
modules.d/90multipath/multipathd.service | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules.d/90multipath/module-setup.sh
b/modules.d/90multipath/module-setup.sh
index 508241e..0149df9 100755
--- a/modules.d/90multipath/module-setup.sh
+++ b/modules.d/90multipath/module-setup.sh
@@ -92,8 +92,8 @@ install() {
if dracut_module_included "systemd"; then
inst_simple "${moddir}/multipathd.service"
"${systemdsystemunitdir}/multipathd.service"
- mkdir -p "${initdir}${systemdsystemconfdir}/sysinit.target.wants"
- ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service"
"${initdir}${systemdsystemconfdir}/sysinit.target.wants/multipathd.service"
+ mkdir -p "${initdir}${systemdsystemunitdir}/sysinit.target.wants"
+ ln -rfs "${initdir}${systemdsystemunitdir}/multipathd.service"
"${initdir}${systemdsystemunitdir}/sysinit.target.wants/multipathd.service"
else
inst_hook pre-trigger 02 "$moddir/multipathd.sh"
inst_hook cleanup 02 "$moddir/multipathd-stop.sh"
diff --git a/modules.d/90multipath/multipathd.service
b/modules.d/90multipath/multipathd.service
index 01e497c..50a0883 100644
--- a/modules.d/90multipath/multipathd.service
+++ b/modules.d/90multipath/multipathd.service
@@ -5,9 +5,9 @@ DefaultDependencies=no
Conflicts=shutdown.target
[Service]
-Type=forking
+Type=simple
ExecStartPre=/sbin/modprobe dm-multipath
-ExecStart=/sbin/multipathd
+ExecStart=/sbin/multipathd -s -d
ExecReload=/sbin/multipathd reconfigure
ExecStop=/sbin/multipathd shutdown
--
1.8.1.4
++++++ add_dracuts_network_params_for_iscsi.patch ++++++
Index: dracut-037/modules.d/95iscsi/module-setup.sh
===================================================================
--- dracut-037.orig/modules.d/95iscsi/module-setup.sh 2014-03-19
17:16:08.000000000 +0100
+++ dracut-037/modules.d/95iscsi/module-setup.sh 2014-04-14
13:40:02.560200357 +0200
@@ -39,6 +39,22 @@ depends() {
installkernel() {
local _arch=$(uname -m)
+ install_ibft() {
+ local IBFT_NICS="ethernet"
+ local IBFT_ROOT="/sys/firmware/ibft"
+
+ # When iBFT is detected:
+ # - mark network as mandatory
+ # - specify firmware booting cmdline parameter
+ if [ -d "${IBFT_ROOT}/${IBFT_NICS}"* ]; then
+ echo "rd.neednet=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf"
+ echo "rd.iscsi.firmware=1" >>
"${initdir}/etc/cmdline.d/95iscsi.conf"
+ fi
+ }
+
+ # Detect iBFT and perform mandatory steps
+ install_ibft
+
instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi
hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs
iscsi_module_filter() {
++++++ fix-iscsi-firmware.patch ++++++
--- /var/tmp/diff_new_pack.GrC4sm/_old 2014-04-26 11:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.GrC4sm/_new 2014-04-26 11:44:59.000000000 +0200
@@ -8,16 +8,12 @@
modules.d/95iscsi/parse-iscsiroot.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
-diff --git a/modules.d/95iscsi/parse-iscsiroot.sh
b/modules.d/95iscsi/parse-iscsiroot.sh
-index 4be9d56..ec7764e 100755
---- a/modules.d/95iscsi/parse-iscsiroot.sh
-+++ b/modules.d/95iscsi/parse-iscsiroot.sh
-@@ -61,10 +61,9 @@ fi
-
- # iscsi_firmware does not need argument checking
- if [ -n "$iscsi_firmware" ] ; then
-- netroot=${netroot:-iscsi:}
-+ netroot=${netroot:-iscsi}
+Index: dracut-037/modules.d/95iscsi/parse-iscsiroot.sh
+===================================================================
+--- dracut-037.orig/modules.d/95iscsi/parse-iscsiroot.sh 2014-03-19
17:16:08.000000000 +0100
++++ dracut-037/modules.d/95iscsi/parse-iscsiroot.sh 2014-04-15
11:49:40.922075002 +0200
+@@ -64,7 +64,6 @@ if [ -n "$iscsi_firmware" ] ; then
+ netroot=${netroot:-iscsi:}
modprobe -q iscsi_boot_sysfs 2>/dev/null
modprobe -q iscsi_ibft
- initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot'
'$NEWROOT'"
@@ -33,6 +29,3 @@
fi
fi
---
-1.8.1.4
-
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
