Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-09-12 11:19:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-06 12:17:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-09-12 11:19:09.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Sep 11 13:36:03 UTC 2014 - tr...@suse.de + +- dracut.usage.asc: Remove distro specific help from manpage (bnc#895363) +*Add 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch +- Add /boot/zipl to host devs if it is a mount point (bnc#892187) +*Add 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch +- Add SUSE kernel module dependencies (in /etc/modprobe.d/*) (bnc#895331) +*Add 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch +------------------------------------------------------------------- New: ---- 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.zZABsB/_old 2014-09-12 11:19:11.000000000 +0200 +++ /var/tmp/diff_new_pack.zZABsB/_new 2014-09-12 11:19:11.000000000 +0200 @@ -176,6 +176,9 @@ 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 +Patch156: 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch +Patch157: 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch +Patch158: 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch BuildRequires: asciidoc BuildRequires: bash @@ -374,6 +377,9 @@ %patch153 -p1 %patch154 -p1 %patch155 -p1 +%patch156 -p1 +%patch157 -p1 +%patch158 -p1 %build %configure\ ++++++ 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch ++++++ >From 8c53ac66b29e91fa5a6140e7e414ca884032fd11 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <tr...@suse.de> Date: Mon, 8 Sep 2014 16:43:20 +0200 Subject: dracut.usage.asc: Remove distro specific help from manpage Signed-off-by: Thomas Renninger <tr...@suse.de> --- dracut.usage.asc | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dracut.usage.asc b/dracut.usage.asc index 0787ead..6f3c513 100644 --- a/dracut.usage.asc +++ b/dracut.usage.asc @@ -246,21 +246,6 @@ specified multiple times. If your root partition is on a network drive, you have to have the network dracut modules installed to create a network aware initramfs image. -On a Red Hat Enterprise Linux or Fedora system, this means, you have to install -the _dracut-network_ rpm package: - - ----- -# yum install dracut-network ----- - -The resulting initramfs image can be served by a boot manager residing on your -local hard drive or it can be served by a PXE/TFTP server. - -How to setup your PXE/TFTP server can be found in the -http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Storage_Administration_Guide/[Red -Hat Enterprise Linux Storage Administration Guide]. - If you specify ip=auto on the kernel command line, then dracut asks a dhcp server about the ip adress for the machine. The dhcp server can also serve an additional root-path, which will set the root device for dracut. With this @@ -300,7 +285,7 @@ This will reduce the size of the initramfs image significantly. If the boot process does not succeed, you have several options to debug the situation. Some of the basic operations are covered here. For more information you should also visit: -http://fedoraproject.org/wiki/How_to_debug_Dracut_problems +https://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html [[identifying-your-problem-area]] -- 1.7.6.1 ++++++ 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch ++++++ >From 7067073ca16b10749edd6a508e3c4b1c38c3c7c2 Mon Sep 17 00:00:00 2001 From: Thomas Renninger <tr...@suse.de> Date: Thu, 11 Sep 2014 15:17:10 +0200 Subject: Add /boot/zipl to host devs if it is a mount point bnc#892187 Signed-off-by: Thomas Renninger <tr...@suse.de> --- dracut.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dracut.sh b/dracut.sh index 3a0c64b..411a972 100755 --- a/dracut.sh +++ b/dracut.sh @@ -1077,6 +1077,7 @@ if [[ $hostonly ]]; then "/usr/lib64" \ "/boot" \ "/boot/efi" \ + "/boot/zipl" \ ; do mp=$(readlink -f "$mp") -- 1.7.6.1 ++++++ 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch ++++++ >From 75faba5ea84fe53df7d3ca3e4f4b6cf390c824bb Mon Sep 17 00:00:00 2001 From: Jan Loseser <jloe...@suse.de> Date: Thu, 11 Sep 2014 15:20:23 +0200 Subject: Add SUSE kernel module dependencies (in /etc/modprobe.d/*) bnc#895331 CC: Jan Loeser <jloe...@suse.de> --- dracut-functions.sh | 6 +++++- dracut.sh | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh index 208c295..7d81f65 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -1706,8 +1706,12 @@ instmods() { --set-version $kernel ${_moddirname} $_mpargs ((_ret+=$?)) else - [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && \ + if [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] && [ -n "$_mod" ]; then echo $_mod >> "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist" + for suse_mod_dep in ${suse_mod_deps["$_mod"]}; do + echo $suse_mod_dep >> "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist" + done + fi fi ;; esac diff --git a/dracut.sh b/dracut.sh index 411a972..c301138 100755 --- a/dracut.sh +++ b/dracut.sh @@ -823,6 +823,18 @@ if [[ -n "$logfile" ]];then fi fi +# parse SUSE kernel module dependencies +# Kernel modules using "load_module" function may not show up in modprobe +# depencies. While this is the case there is a workaround in SUSE which adds: +# # SUSE_INITRD: module_name REQUIRES module1 module2 ... +# to /etc/modprobe.d/*.conf +declare -A suse_mod_deps +while read -r line; do + _suse_mod="${line##*SUSE INITRD: }" + _suse_mod="${_suse_mod%% REQUIRES*}" + suse_mod_deps["$_suse_mod"]="${suse_mod_deps["$_suse_mod"]} ${line##*REQUIRES }" +done <<< "$(grep -h "^# SUSE INITRD: " /etc/modprobe.d/[0-9][0-9]*.conf)" + # handle compression options. [[ $compress ]] || compress="gzip" case $compress in -- 1.7.6.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
