Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2014-09-06 12:17:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-30
18:56:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-09-06
12:17:36.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Sep 4 12:59:27 UTC 2014 - tr...@suse.de
+
+- Network module may take quite a lot of initrd space. Do not add it
+ unconditionally (bnc#892851)
+* Add 0153-Only-add-network-module-on-request-and-on-dependenci.patch
+- S390x can do s2disk, allow resume module there
+ (bnc#889795)
+* Add 0154-resume-Also-allow-this-module-on-S390-again-s2disk-c.patch
+- Harden iscsi parameter checking. No bug report, but this problem
+ was found during multipath testing and happens with 2 or more
+ iscsi devices.
+* Add 0155-iscsi-iscsi.initiator-and-others-can-and-must-only-s.patch
+
+-------------------------------------------------------------------
New:
----
0153-Only-add-network-module-on-request-and-on-dependenci.patch
0154-resume-Also-allow-this-module-on-S390-again-s2disk-c.patch
0155-iscsi-iscsi.initiator-and-others-can-and-must-only-s.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.5FAiIE/_old 2014-09-06 12:17:38.000000000 +0200
+++ /var/tmp/diff_new_pack.5FAiIE/_new 2014-09-06 12:17:38.000000000 +0200
@@ -173,6 +173,9 @@
Patch150: 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch
Patch151: 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch
Patch152: 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch
+Patch153: 0153-Only-add-network-module-on-request-and-on-dependenci.patch
+Patch154: 0154-resume-Also-allow-this-module-on-S390-again-s2disk-c.patch
+Patch155: 0155-iscsi-iscsi.initiator-and-others-can-and-must-only-s.patch
BuildRequires: asciidoc
BuildRequires: bash
@@ -368,6 +371,9 @@
%patch150 -p1
%patch151 -p1
%patch152 -p1
+%patch153 -p1
+%patch154 -p1
+%patch155 -p1
%build
%configure\
++++++ 0153-Only-add-network-module-on-request-and-on-dependenci.patch ++++++
>From 8692d504138fdae15a1f94702efe3948917781cf Mon Sep 17 00:00:00 2001
From: Thomas Renninger <tr...@suse.de>
Date: Mon, 1 Sep 2014 12:31:26 +0200
Subject: Only add network module on request (and on dependencies)
bnc#892851
Signed-off-by: Thomas Renninger <tr...@suse.de>
---
modules.d/40network/module-setup.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules.d/40network/module-setup.sh
b/modules.d/40network/module-setup.sh
index 8d74450..886866b 100755
--- a/modules.d/40network/module-setup.sh
+++ b/modules.d/40network/module-setup.sh
@@ -11,7 +11,7 @@ check() {
require_binaries ip arping $WICKEDD_DHCP_PATH/wickedd-dhcp4
$WICKEDD_DHCP_PATH/wickedd-dhcp6 || return 1
- return 0
+ return 255
}
# called by dracut
--
1.7.6.1
++++++ 0154-resume-Also-allow-this-module-on-S390-again-s2disk-c.patch ++++++
>From 30cb6e8070804878a060ffebd685d9a8579c696f Mon Sep 17 00:00:00 2001
From: Thomas Renninger <tr...@suse.de>
Date: Wed, 3 Sep 2014 13:49:16 +0200
Subject: resume: Also allow this module on S390 again -> s2disk can work on
s390(x)
bnc#889795
Signed-off-by: Thomas Renninger <tr...@suse.de>
---
modules.d/95resume/module-setup.sh | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/modules.d/95resume/module-setup.sh
b/modules.d/95resume/module-setup.sh
index b1044ed..108e6ab 100755
--- a/modules.d/95resume/module-setup.sh
+++ b/modules.d/95resume/module-setup.sh
@@ -4,10 +4,6 @@
# called by dracut
check() {
- local _arch=$(uname -m)
- # No suspend support on s390(x)
- [ "$_arch" = "s390" -o "$_arch" = "s390x" ] && return 1
-
# No point trying to support resume, if no swap partition exist
[[ $hostonly ]] || [[ $mount_needs ]] && {
for fs in "${host_fs_types[@]}"; do
--
1.7.6.1
++++++ 0155-iscsi-iscsi.initiator-and-others-can-and-must-only-s.patch ++++++
>From 26a858af5977a41b21839ce8411024bfe3f63dea Mon Sep 17 00:00:00 2001
From: Thomas Renninger <tr...@suse.de>
Date: Thu, 4 Sep 2014 13:36:18 +0200
Subject: iscsi: iscsi.initiator and others can and must only show up once
Make sure duplicates of iscsi.initiator vanish.
Only get one rd.iscsi.* paramter value. If getargs is used and several
parameters are parsed, one gets two values separated by whitespace in a
variable which breaks later code and is not suppported.
Signed-off-by: Thomas Renninger <tr...@suse.de>
---
modules.d/95iscsi/iscsiroot.sh | 18 +++++++++---------
modules.d/95iscsi/module-setup.sh | 5 ++++-
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/modules.d/95iscsi/iscsiroot.sh b/modules.d/95iscsi/iscsiroot.sh
index 1de6fb7..1c4be4e 100755
--- a/modules.d/95iscsi/iscsiroot.sh
+++ b/modules.d/95iscsi/iscsiroot.sh
@@ -83,23 +83,23 @@ handle_netroot()
local p
# override conf settings by command line options
- arg=$(getargs rd.iscsi.initiator -d iscsi_initiator=)
+ arg=$(getarg rd.iscsi.initiator -d iscsi_initiator=)
[ -n "$arg" ] && iscsi_initiator=$arg
- arg=$(getargs rd.iscsi.target.name -d iscsi_target_name=)
+ arg=$(getarg rd.iscsi.target.name -d iscsi_target_name=)
[ -n "$arg" ] && iscsi_target_name=$arg
- arg=$(getargs rd.iscsi.target.ip -d iscsi_target_ip)
+ arg=$(getarg rd.iscsi.target.ip -d iscsi_target_ip)
[ -n "$arg" ] && iscsi_target_ip=$arg
- arg=$(getargs rd.iscsi.target.port -d iscsi_target_port=)
+ arg=$(getarg rd.iscsi.target.port -d iscsi_target_port=)
[ -n "$arg" ] && iscsi_target_port=$arg
- arg=$(getargs rd.iscsi.target.group -d iscsi_target_group=)
+ arg=$(getarg rd.iscsi.target.group -d iscsi_target_group=)
[ -n "$arg" ] && iscsi_target_group=$arg
- arg=$(getargs rd.iscsi.username -d iscsi_username=)
+ arg=$(getarg rd.iscsi.username -d iscsi_username=)
[ -n "$arg" ] && iscsi_username=$arg
- arg=$(getargs rd.iscsi.password -d iscsi_password)
+ arg=$(getarg rd.iscsi.password -d iscsi_password)
[ -n "$arg" ] && iscsi_password=$arg
- arg=$(getargs rd.iscsi.in.username -d iscsi_in_username=)
+ arg=$(getarg rd.iscsi.in.username -d iscsi_in_username=)
[ -n "$arg" ] && iscsi_in_username=$arg
- arg=$(getargs rd.iscsi.in.password -d iscsi_in_password=)
+ arg=$(getarg rd.iscsi.in.password -d iscsi_in_password=)
[ -n "$arg" ] && iscsi_in_password=$arg
for p in $(getargs rd.iscsi.param -d iscsi_param); do
iscsi_param="$iscsi_param --param $p"
diff --git a/modules.d/95iscsi/module-setup.sh
b/modules.d/95iscsi/module-setup.sh
index 9772210..4784ea3 100755
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -99,7 +99,10 @@ install_iscsiroot() {
iscsi_address="[$iscsi_address]"
;;
esac
- echo "rd.iscsi.initiator=${iscsi_initiator}
netroot=iscsi:${iscsi_address}::${iscsi_port}:${iscsi_lun}:${iscsi_targetname}"
+ # Must be two separate lines, so that "sort | uniq" commands later
+ # can sort out rd.iscsi.initiator= duplicates
+ echo "rd.iscsi.initiator=${iscsi_initiator}"
+ echo
"netroot=iscsi:${iscsi_address}::${iscsi_port}:${iscsi_lun}:${iscsi_targetname}"
fi
return 0
}
--
1.7.6.1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
