Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2014-05-10 08:32:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05-02
09:52:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-05-10
08:32:29.000000000 +0200
@@ -1,0 +2,26 @@
+Wed May 7 15:25:37 UTC 2014 - tr...@suse.de
+
+- Do not inst binaries explicitly into /bin or /usr/bin, it is already taken
+ care of internally for that:
+ Delete 0006-Install-bin-mount.patch
+ Modify 0013-Correct-paths-for-openSUSE.patch
+- Do not stop trying to load drivers (via add-drivers or filesystems) if one
+ fails
+ Add 0025-dracut_continue_adding_modules_also_on_error.patch
+- Introduce force-drivers. mkinitrd should use this one instead of add-drivers
+ later, if accepted mainline
+ Add
+ 0026-force_to_add_and_load_kernel_modules_other_than_via_boot_param.patch
+
+-------------------------------------------------------------------
+Mon May 5 08:55:37 CEST 2014 - h...@suse.de
+
+- Update add_dracuts_network_params_for_iscsi.patch to detect
+ be2iscsi firmware devices
+- Remove obsolete patch fix-iscsi-firmware.sh
+- Fixup iscsi firmware booting with be2iscsi (bnc#873448):
+ Added 0024-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch
+- Renamed mkinird_differ_host_and_cmdline_only_properly.patch to
+ 0023-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch
+
+-------------------------------------------------------------------
Old:
----
0006-Install-bin-mount.patch
fix-iscsi-firmware.patch
mkinird_differ_host_and_cmdline_only_properly.patch
New:
----
0023-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch
0024-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch
0025-dracut_continue_adding_modules_also_on_error.patch
0026-force_to_add_and_load_kernel_modules_other_than_via_boot_param.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.kkd9ws/_old 2014-05-10 08:32:30.000000000 +0200
+++ /var/tmp/diff_new_pack.kkd9ws/_new 2014-05-10 08:32:30.000000000 +0200
@@ -36,13 +36,11 @@
Source6: dracut-installkernel
Source7: write-ifcfg-suse.sh
Patch1: dracut_v37_to_HEAD.patch
-Patch10: 0006-Install-bin-mount.patch
Patch11: 0013-Correct-paths-for-openSUSE.patch
Patch12: 0014-Check-for-plymouth-lib-directories.patch
Patch13: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
Patch14: suse_grub_manpage.patch
Patch15: replace_dhclient_with_wickedd_dhcp_supplicants.patch
-Patch16: fix-iscsi-firmware.patch
Patch18: 0015-add-new-s390x-specific-rule-files.patch
Patch19: change_write_ifcfg_to_suse.patch
Patch20: dracut-fix-whitespace-add-drivers_call.patch
@@ -59,7 +57,10 @@
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
-Patch36: mkinird_differ_host_and_cmdline_only_properly.patch
+Patch36: 0023-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch
+Patch37: 0024-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch
+Patch38: 0025-dracut_continue_adding_modules_also_on_error.patch
+Patch39:
0026-force_to_add_and_load_kernel_modules_other_than_via_boot_param.patch
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@@ -110,13 +111,11 @@
%prep
%setup -q
%patch1 -p1
-%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
-%patch16 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
@@ -134,6 +133,9 @@
%patch34 -p1
%patch35 -p1
%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
%build
%configure\
++++++ 0013-Correct-paths-for-openSUSE.patch ++++++
--- /var/tmp/diff_new_pack.kkd9ws/_old 2014-05-10 08:32:30.000000000 +0200
+++ /var/tmp/diff_new_pack.kkd9ws/_new 2014-05-10 08:32:30.000000000 +0200
@@ -27,19 +27,6 @@
[[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
[[ $tmpdir ]] || tmpdir=/var/tmp
[[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
-Index: dracut-037/modules.d/10i18n/module-setup.sh
-===================================================================
---- dracut-037.orig/modules.d/10i18n/module-setup.sh
-+++ dracut-037/modules.d/10i18n/module-setup.sh
-@@ -96,6 +96,8 @@ install() {
-
- install_base() {
- inst_multiple setfont loadkeys kbd_mode stty
-+ inst /usr/bin/setfont /bin/setfont
-+ inst /usr/bin/loadkeys /bin/loadkeys
-
- if ! dracut_module_included "systemd"; then
- inst ${moddir}/console_init.sh /lib/udev/console_init
Index: dracut-037/modules.d/98systemd/rescue.service
===================================================================
--- dracut-037.orig/modules.d/98systemd/rescue.service
++++++ 0023-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch ++++++
>From c99348f3337fde44a98abf5946b7cbf36bce1b0e Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Mon, 5 May 2014 08:38:44 +0200
Subject: mkinitrd-suse.sh: Use '--hostonly' and '--hostonly-cmdline' correctly
LVM and other systems might not be working properly as the
--hostonly-cmdline flag has to be active by default.
References: bnc#874000,bnc#874905,bnc#874363
Signed-off-by: Thomas Renninger <tr...@suse.de>
---
mkinitrd-suse.8.asc | 4 +++-
mkinitrd-suse.sh | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/mkinitrd-suse.8.asc b/mkinitrd-suse.8.asc
index 9eb8fc9..a181b75 100644
--- a/mkinitrd-suse.8.asc
+++ b/mkinitrd-suse.8.asc
@@ -76,7 +76,9 @@ OPTIONS
**-A**::
Create a so called "monster initrd" which includes all available
- features and modules.
+ features and modules. This calls dracut with --no-hostonly and
+ --no-hostonly-cmdline parameters internally, instead of the default
+ --hostonly and --hostonly-cmdline.
**-v, --verbose**::
increase verbosity level
diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh
index 1c2634f..c02062d 100755
--- a/mkinitrd-suse.sh
+++ b/mkinitrd-suse.sh
@@ -297,7 +297,11 @@ targets=( $targets )
[[ $kernels ]] && kernels=( $kernels )
[[ $logfile ]] && dracut_args="${dracut_args} --logfile $logfile"
-[[ $host_only == 1 ]] && dracut_args="${dracut_args} --hostonly"
+if [[ $host_only == 1 ]];then
+ dracut_args="${dracut_args} --hostonly --hostonly-cmdline"
+else
+ dracut_args="${dracut_args} --no-hostonly --no-hostonly-cmdline"
+fi
[[ $force == 1 ]] && dracut_args="${dracut_args} --force"
[[ $dracut_cmdline ]] && dracut_args="${dracut_args} --kernel-cmdline
${dracut_cmdline}"
[ -z "$(type -p update-bootloader)" ] && skip_update_bootloader=1
--
1.8.5.2
++++++ 0024-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch ++++++
>From 2a30da782e48d953507ca793ab0bc7f78b37db9f Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Mon, 5 May 2014 08:48:35 +0200
Subject: 95iscsi: Set correct iscsi_started value for iSCSI firmware
When iSCSI firmware booting is selected we should not rely on
'netroot' or 'iscsiroot' variables to be set.
References: bnc#873448
Signed-off-by: Hannes Reinecke <h...@suse.de>
---
modules.d/95iscsi/parse-iscsiroot.sh | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules.d/95iscsi/parse-iscsiroot.sh
b/modules.d/95iscsi/parse-iscsiroot.sh
index a965cc6..c1a47d2 100755
--- a/modules.d/95iscsi/parse-iscsiroot.sh
+++ b/modules.d/95iscsi/parse-iscsiroot.sh
@@ -98,8 +98,12 @@ if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [
"$root" != "dhcp" ]; the
fi
fi
-netroot_enc=$(str_replace "$netroot" '/' '\2f')
-echo "[ -f '/tmp/iscsistarted-$netroot_enc' ]" >
$hookdir/initqueue/finished/iscsi_started.sh
+if [ -n "$iscsi_firmware" ] ; then
+ echo "[ -f '/tmp/iscsistarted-firmware' ]" >
$hookdir/initqueue/finished/iscsi_started.sh
+else
+ netroot_enc=$(str_replace "$netroot" '/' '\2f')
+ echo "[ -f '/tmp/iscsistarted-$netroot_enc' ]" >
$hookdir/initqueue/finished/iscsi_started.sh
+fi
# Done, all good!
rootok=1
--
1.8.5.2
++++++ 0025-dracut_continue_adding_modules_also_on_error.patch ++++++
dracut: Do not stop installing drivers if one fails
--add-drivers and --filesystems kernel drivers are added via:
instmods -c
The check option makes the function return if one driver could not get
installed without trying to install further drivers which is bad.
The user is still informed ($_silent is by default no), but all modules
passed to instmods are tried to be loaded, even if one fails.
Signed-off-by: Thomas Renninger <tr...@suse.de>
Index: dracut-037/dracut-functions.sh
===================================================================
--- dracut-037.orig/dracut-functions.sh
+++ dracut-037/dracut-functions.sh
@@ -1689,18 +1689,16 @@ instmods() {
if (($# == 0)); then # filenames from stdin
while read _mod; do
inst1mod "${_mod%.ko*}" || {
- if [[ "$_check" == "yes" ]]; then
- [[ "$_silent" == "no" ]] && dfatal "Failed to install
module $_mod"
- return 1
+ if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]];
then
+ dfatal "Failed to install module $_mod"
fi
}
done
fi
while (($# > 0)); do # filenames as arguments
inst1mod ${1%.ko*} || {
- if [[ "$_check" == "yes" ]]; then
- [[ "$_silent" == "no" ]] && dfatal "Failed to install
module $1"
- return 1
+ if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then
+ dfatal "Failed to install module $1"
fi
}
shift
++++++
0026-force_to_add_and_load_kernel_modules_other_than_via_boot_param.patch ++++++
dracut: Introduce --force-drivers parameter and force_drivers=+ config option
Which will not only add listed drivers, but also enforce that they are tried
to be loaded at early boot time.
This is needed if drivers which are not autoloaded (e.g. loop and a lot others)
shall get loaded via initramfs.
Signed-off-by: Thomas Renninger <tr...@suse.de>
Index: dracut-037/dracut.sh
===================================================================
--- dracut-037.orig/dracut.sh
+++ dracut-037/dracut.sh
@@ -81,6 +81,10 @@ Creates initial ramdisk images for prelo
exclusively include in the initramfs.
--add-drivers [LIST] Specify a space-separated list of kernel
modules to add to the initramfs.
+ --force-drivers [LIST] Specify a space-separated list of kernel
+ modules to add to the initramfs and make sure they
+ are tried to be loaded via modprobe same as passing
+ rd.driver.pre=DRIVER kernel parameter.
--omit-drivers [LIST] Specify a space-separated list of kernel
modules not to add to the initramfs.
--filesystems [LIST] Specify a space-separated list of kernel filesystem
@@ -299,6 +303,7 @@ rearrange_params()
--long add: \
--long force-add: \
--long add-drivers: \
+ --long force-drivers: \
--long omit-drivers: \
--long modules: \
--long omit: \
@@ -463,6 +468,7 @@ while :; do
-a|--add) push add_dracutmodules_l "$2"; PARMS_TO_STORE+="
'$2'"; shift;;
--force-add) push force_add_dracutmodules_l "$2"; PARMS_TO_STORE+="
'$2'"; shift;;
--add-drivers) push add_drivers_l "$2"; PARMS_TO_STORE+="
'$2'"; shift;;
+ --force-drivers) push force_drivers_l "$2"; PARMS_TO_STORE+="
'$2'"; shift;;
--omit-drivers) push omit_drivers_l "$2"; PARMS_TO_STORE+="
'$2'"; shift;;
-m|--modules) push dracutmodules_l "$2"; PARMS_TO_STORE+="
'$2'"; shift;;
-o|--omit) push omit_dracutmodules_l "$2"; PARMS_TO_STORE+="
'$2'"; shift;;
@@ -880,6 +886,13 @@ if (( ${#add_drivers_l[@]} )); then
fi
add_drivers=${add_drivers/-/_}
+if (( ${#force_drivers_l[@]} )); then
+ while pop force_drivers_l val; do
+ force_drivers+=" $val "
+ done
+fi
+force_drivers=${force_drivers/-/_}
+
if (( ${#omit_drivers_l[@]} )); then
while pop omit_drivers_l val; do
omit_drivers+=" $val "
@@ -896,6 +909,7 @@ fi
omit_drivers_corrected=""
for d in $omit_drivers; do
[[ " $drivers $add_drivers " == *\ $d\ * ]] && continue
+ [[ " $drivers $force_drivers " == *\ $d\ * ]] && continue
omit_drivers_corrected+="$d|"
done
omit_drivers="${omit_drivers_corrected%|}"
@@ -1287,6 +1301,13 @@ if [[ $no_kernel != yes ]]; then
if [[ $add_drivers ]]; then
hostonly='' instmods -c $add_drivers
fi
+ if [[ $force_drivers ]]; then
+ hostonly='' instmods -c $force_drivers
+ rm -f $initdir/etc/cmdline.d/20-force_driver.conf
+ for mod in $force_drivers; do
+ echo "rd.driver.pre=$mod"
>>$initdir/etc/cmdline.d/20-force_drivers.conf
+ done
+ fi
if [[ $filesystems ]]; then
hostonly='' instmods -c $filesystems
fi
Index: dracut-037/dracut.8.asc
===================================================================
--- dracut-037.orig/dracut.8.asc
+++ dracut-037/dracut.8.asc
@@ -136,6 +136,19 @@ example:
----
===============================
+**--force-drivers** _<list of kernel modules>_::
+ See add-drivers above. But in this case it is ensured that the drivers
+ are tried to be loaded early via modprobe.
++
+[NOTE]
+===============================
+If [LIST] has multiple arguments, then you have to put these in quotes. For
+example:
+----
+# dracut --force-drivers "kmodule1 kmodule2" ...
+----
+===============================
+
**--omit-drivers** _<list of kernel modules>_::
specify a space-separated list of kernel modules not to add to the
initramfs.
++++++ add_dracuts_network_params_for_iscsi.patch ++++++
--- /var/tmp/diff_new_pack.kkd9ws/_old 2014-05-10 08:32:30.000000000 +0200
+++ /var/tmp/diff_new_pack.kkd9ws/_new 2014-05-10 08:32:30.000000000 +0200
@@ -1,22 +1,40 @@
-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
+From c1db8b0b1a7545c9edf2b0b2328733c44ba4e8f1 Mon Sep 17 00:00:00 2001
+From: Hannes Reinecke <h...@suse.de>
+Date: Mon, 5 May 2014 08:32:16 +0200
+Subject: 95iscsi: Autodetect iSCSI firmware
+
+Some iSCSI initiator present firmware information in
+/sys/firmware/ibft or /sys/firmware/iscsi_bootX
+
+Whenever we detect one of those directories we should assume
+that the iSCSI devices should be activated.
+
+Signed-off-by: Pavel Wieczorkiewicz <pwieczorkiew...@suse.com>
+Signed-off-by: Hannes Reinecke <h...@suse.de>
+---
+ modules.d/95iscsi/module-setup.sh | 16 ++++++++++++++++
+ modules.d/95iscsi/parse-iscsiroot.sh | 10 ++++++++--
+ 2 files changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/95iscsi/module-setup.sh
b/modules.d/95iscsi/module-setup.sh
+index 1b0f292..97e6e81 100755
+--- a/modules.d/95iscsi/module-setup.sh
++++ b/modules.d/95iscsi/module-setup.sh
@@ -39,6 +39,22 @@ depends() {
installkernel() {
local _arch=$(uname -m)
+ install_ibft() {
-+ local IBFT_NICS="ethernet"
-+ local IBFT_ROOT="/sys/firmware/ibft"
++ # When iBFT / iscsi_boot is detected:
++ # - mark network as mandatory
++ # - specify firmware booting cmdline parameter
+
-+ # 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
++ for d in /sys/firmware/* ; do
++ if [ -d ${d}/initiator ] ; then
++ echo "rd.neednet=1" >> "${initdir}/etc/cmdline.d/95iscsi.conf"
++ echo "rd.iscsi.firmware=1" >>
"${initdir}/etc/cmdline.d/95iscsi.conf"
++ fi
++ done
+ }
+
+ # Detect iBFT and perform mandatory steps
@@ -25,3 +43,30 @@
instmods bnx2i qla4xxx cxgb3i cxgb4i be2iscsi
hostonly="" instmods iscsi_tcp iscsi_ibft crc32c iscsi_boot_sysfs
iscsi_module_filter() {
+diff --git a/modules.d/95iscsi/parse-iscsiroot.sh
b/modules.d/95iscsi/parse-iscsiroot.sh
+index 4be9d56..a965cc6 100755
+--- a/modules.d/95iscsi/parse-iscsiroot.sh
++++ b/modules.d/95iscsi/parse-iscsiroot.sh
+@@ -59,11 +59,17 @@ if [ -n "$iscsiroot" ] ; then
+ [ -z "$netroot" ] || [ "$netroot" = "iscsi" ] && netroot=iscsi:$iscsiroot
+ fi
+
++# Autodetect iSCSI firmware targets
++if [ -z "$iscsiroot" ] ; then
++ modprobe -q iscsi_boot_sysfs
++ modprobe -q iscsi_ibft
++ [ -d /sys/firmware/ibft ] && iscsi_firmware="1"
++ [ -d /sys/firmware/iscsi_boot1 ] && iscsi_firmware="1"
++fi
++
+ # iscsi_firmware does not need argument checking
+ 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'"
+ fi
+
+--
+1.8.5.2
+
++++++ change_write_ifcfg_to_suse.patch ++++++
--- /var/tmp/diff_new_pack.kkd9ws/_old 2014-05-10 08:32:30.000000000 +0200
+++ /var/tmp/diff_new_pack.kkd9ws/_new 2014-05-10 08:32:30.000000000 +0200
@@ -5,11 +5,12 @@
Detect the system flavor and write the ifcfg files accordingly.
-Signed-off-by: Hannes Reinecke <h...@suse.de>
-Modified-by: Thomas Rennigner <tr...@suse.de>
- Do not move ifcfg to -suse and -redhat files to avoid re-diffing after
each upgrade. Handle this in the spec file and a separate
write-ifcfg-suse.sh source file
+
+Signed-off-by: Hannes Reinecke <h...@suse.de>
+Modified-by: Thomas Rennigner <tr...@suse.de>
---
modules.d/40network/ifup.sh | 1 +
modules.d/45ifcfg/module-setup.sh | 8 +-
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
