Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2015-04-16 14:11:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-03-01 14:49:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2015-04-16 14:11:15.000000000 +0200 @@ -1,0 +2,116 @@ +Tue Mar 24 15:37:48 UTC 2015 - [email protected] + +- Update to dracut mainline version 041. + Half of the patches got integrated mainline. + Some others have been merged together when it made sense some have + been left out, but are still in the repository as they need some special + treating and mainline discussion whether/how they get added. These are + also not urgently needed, but are debugging patches. + + I broke the rule here to mention every added/deleted/modified patch as + every patch is touched and every 2nd got removed (mainline integrated). + + I also re-ordered the patches in the PatchXY: area for easier merging them + and get them discussed and posted mainline easier, topic by topic. + +- Patches merged in the git tracking repository: + 0065-95iscsi-Fixup-bnx2i-offload-booting.patch + 0028-95udev-rules-Include-correct-sg3_utils-rules.patch + 0135-lvm-Fix-12819a579900b9691e2-check-for-existance-of-6.patch + 0100-Add-btrfs-rescue-utilities.patch + 0067-95fcoe-check-always-returns-255.patch + 0138-warpclock-Do-not-use-warpclock-module-on-S390-x-hwcl.patch + 0077-90multipath-add-missing-11-dm-mpath.rules-file.patch + 0042-Enhance-suse.conf-example-with-SUSE-specific-setting.patch + 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch + 0111-90mdraid-Remove-line-for-offroot-detection.patch + 0129-Revert-commit-6ecab258710d158a7a6-and-only-do-not-wa.patch + 0041-mkinitd-suse-remove-hostonly-and-hostonly-cmdline.patch + 0030-95iscsi-Autodetect-iSCSI-firmware.patch + 0052-99base-Add-chown-binary.patch + 0105-95iscsi-parse-output-from-iscsiadm-correctly.patch + 0101-Print-stored-dracut-commandline-during-initramfs-bui.patch + 0096-dracut-Fix-error-local-can-only-be-used-in-a-functio.patch + 0043-40network-always-add-network-module.patch + 0035-Introduce-force-drivers-parameter-and-force_drivers-.patch + 0136-Revert-95udev-rules-add-persistent-network-rule.patch + 0143-iscsi-Fix-up-ipv6-in-brackets-iterate-over-all-possi.patch + 0167-do-not-symlink-var-log-to-run-log.patch + 0024-Fixup-mdraid-setup.patch + 0032-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch + 0022-95udev-rules-add-persistent-network-rule.patch + 0166-load-xhci-pci.patch + 0047-95resume-skip-module-for-s390-x.patch + 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch + 0055-95fcoe-Only-install-fcoe-module-if-required.patch + 0078-Restore-original-IFS-value.patch + 0046-dracut-Do-not-wait-for-swap-device.patch + 0074-More-empty-cmdline-fixes.patch + 0112-99base-warn-on-invalid-command-for-initqueue.patch + 0034-dracut-Do-not-stop-installing-drivers-if-one-fails.patch + 0139-dracut.sh-check-for-logfile-logfile-option-and-creat.patch + 0127-99base-Increase-initqueue-timeout-in-non-systemd-cas.patch + 0104-Generate-fallback-mount-unit-for-root-filesystem.patch + 0154-resume-Also-allow-this-module-on-S390-again-s2disk-c.patch + 0149-dracut.sh-Fix-fstab-parsing-again.patch + 0027-90multipath-install-dracut-specific-service-file.patch + 0084-95rootfs-block-Correctly-terminate-commandline-param.patch + dracut_v37_to_HEAD.patch + 0128-90lvm-Install-dm-snapshot-module.patch + 0063-90multipath-Install-libgcc_s-library.patch + 0062-95iscsi-Install-libgcc_s-library.patch + 0146-dracut.sh-corrected-logfile-check.patch + 0071-Fix-non-export-of-journal-dev-boot-options.patch + 0044-Add-find-to-debug-binaries.patch + 0039-Remove-force-parameter-from-mkinitrd.patch + 0026-90multipath-add-67-kpartx-compat.rules.patch + 0099-90multipath-Load-device_handler-modules-early-during.patch + 0029-90multipath-install-correct-multipath-rules.patch + 0031-90multipath-Fixup-service-file-for-booting.patch + 0036-95fcoe-Store-current-configuration-in-dracut-cmdline.patch + A patch (dracut_v041_to_HEAD.patch) is being added without being properly referenced from the changelog. + 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch + 0069-81cio_ignore-skip-module-if-cio_ignore-is-not-active.patch + 0070-81cio_ignore-rewrite-module.patch + 0033-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch + 0098-Do-not-call-lvm-for-non-LVM-device-mapper-devices.patch + 0023-systemd-always-tries-to-load-autofs4.patch + 0051-mkinitrd-suse-add-update-bootloader-message.patch + 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch + 0115-Handle-module-alias-properly.patch + 0054-95iscsi-update-commandline-printing.patch + 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch + 0122-btrfs-btrfs-dump-super-and-btrfs-select-super-do-not.patch + 0045-40network-add-missing-_arch-variable-declaration.patch + 0050-95iscsi-strip-one-set-of-quotes-when-calling-initque.patch + 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch + 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch + 0038-95fcoe-start-lldpad-separately.patch + 0082-00warpclock-check-for-sbin-hwclock.patch + 0155-iscsi-iscsi.initiator-and-others-can-and-must-only-s.patch + 0037-95fcoe-update-fcoe-interface-check.patch + 0141-iscsi-Avoid-bad-ip-route-call-on-empty-address.patch + 0049-95iscsi-Use-ip-ibft-for-ibft-autoconfiguration.patch + 0153-Only-add-network-module-on-request-and-on-dependenci.patch + 0097-Implement-rd.timeout-to-modify-the-device-timeout.patch + 0169-fix-systemd-vconsole.patch + 0073-Don-t-create-lots-of-empty-cmdline-files-for-hostonl.patch + 0103-Fixup-missing-separators-in-rootfs-block-cmdline.patch + 0064-90kernel-modules-install-scsi_dh_alua.patch + 0012-Check-for-plymouth-lib-directories.patch + 0092-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch + 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch + 0093-95iscsi-generate-commandline-for-software-iscsi.patch + 0040-95fcoe-skip-VLAN-devices-in-fcoe-up.patch + 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch + 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch + 0140-dracut.sh-Avoid-duplicate-devices-in-host_devs.patch + 0095-95iscsi-use-static-configuration-for-software-iscsi.patch + 0025-95udev-rules-Add-59-scsi-sg_utils.rules.patch + 0072-Also-export-root-boot-param-for-hostonly-cmdline-cas.patch + 0102-Align-dev_unit_name-with-systemd-s-function.patch + 0001-kernel-modules-Fix-storage-module-selection-for-sdhc.patch + +- Added dracut_v041_to_HEAD.patch: new patch from v041 against our git + +------------------------------------------------------------------- Old: ---- 0001-kernel-modules-Fix-storage-module-selection-for-sdhc.patch 0012-Check-for-plymouth-lib-directories.patch 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch 0022-95udev-rules-add-persistent-network-rule.patch 0023-systemd-always-tries-to-load-autofs4.patch 0024-Fixup-mdraid-setup.patch 0025-95udev-rules-Add-59-scsi-sg_utils.rules.patch 0026-90multipath-add-67-kpartx-compat.rules.patch 0027-90multipath-install-dracut-specific-service-file.patch 0028-95udev-rules-Include-correct-sg3_utils-rules.patch 0029-90multipath-install-correct-multipath-rules.patch 0030-95iscsi-Autodetect-iSCSI-firmware.patch 0031-90multipath-Fixup-service-file-for-booting.patch 0032-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch 0033-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch 0034-dracut-Do-not-stop-installing-drivers-if-one-fails.patch 0035-Introduce-force-drivers-parameter-and-force_drivers-.patch 0036-95fcoe-Store-current-configuration-in-dracut-cmdline.patch 0037-95fcoe-update-fcoe-interface-check.patch 0038-95fcoe-start-lldpad-separately.patch 0039-Remove-force-parameter-from-mkinitrd.patch 0040-95fcoe-skip-VLAN-devices-in-fcoe-up.patch 0041-mkinitd-suse-remove-hostonly-and-hostonly-cmdline.patch 0042-Enhance-suse.conf-example-with-SUSE-specific-setting.patch 0043-40network-always-add-network-module.patch 0044-Add-find-to-debug-binaries.patch 0045-40network-add-missing-_arch-variable-declaration.patch 0046-dracut-Do-not-wait-for-swap-device.patch 0047-95resume-skip-module-for-s390-x.patch 0049-95iscsi-Use-ip-ibft-for-ibft-autoconfiguration.patch 0050-95iscsi-strip-one-set-of-quotes-when-calling-initque.patch 0051-mkinitrd-suse-add-update-bootloader-message.patch 0052-99base-Add-chown-binary.patch 0054-95iscsi-update-commandline-printing.patch 0055-95fcoe-Only-install-fcoe-module-if-required.patch 0062-95iscsi-Install-libgcc_s-library.patch 0063-90multipath-Install-libgcc_s-library.patch 0064-90kernel-modules-install-scsi_dh_alua.patch 0065-95iscsi-Fixup-bnx2i-offload-booting.patch 0067-95fcoe-check-always-returns-255.patch 0069-81cio_ignore-skip-module-if-cio_ignore-is-not-active.patch 0070-81cio_ignore-rewrite-module.patch 0071-Fix-non-export-of-journal-dev-boot-options.patch 0072-Also-export-root-boot-param-for-hostonly-cmdline-cas.patch 0073-Don-t-create-lots-of-empty-cmdline-files-for-hostonl.patch 0074-More-empty-cmdline-fixes.patch 0077-90multipath-add-missing-11-dm-mpath.rules-file.patch 0078-Restore-original-IFS-value.patch 0082-00warpclock-check-for-sbin-hwclock.patch 0084-95rootfs-block-Correctly-terminate-commandline-param.patch 0092-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch 0093-95iscsi-generate-commandline-for-software-iscsi.patch 0095-95iscsi-use-static-configuration-for-software-iscsi.patch 0096-dracut-Fix-error-local-can-only-be-used-in-a-functio.patch 0097-Implement-rd.timeout-to-modify-the-device-timeout.patch 0098-Do-not-call-lvm-for-non-LVM-device-mapper-devices.patch 0099-90multipath-Load-device_handler-modules-early-during.patch 0100-Add-btrfs-rescue-utilities.patch 0101-Print-stored-dracut-commandline-during-initramfs-bui.patch 0102-Align-dev_unit_name-with-systemd-s-function.patch 0103-Fixup-missing-separators-in-rootfs-block-cmdline.patch 0104-Generate-fallback-mount-unit-for-root-filesystem.patch 0105-95iscsi-parse-output-from-iscsiadm-correctly.patch 0111-90mdraid-Remove-line-for-offroot-detection.patch 0112-99base-warn-on-invalid-command-for-initqueue.patch 0115-Handle-module-alias-properly.patch 0122-btrfs-btrfs-dump-super-and-btrfs-select-super-do-not.patch 0127-99base-Increase-initqueue-timeout-in-non-systemd-cas.patch 0128-90lvm-Install-dm-snapshot-module.patch 0129-Revert-commit-6ecab258710d158a7a6-and-only-do-not-wa.patch 0135-lvm-Fix-12819a579900b9691e2-check-for-existance-of-6.patch 0136-Revert-95udev-rules-add-persistent-network-rule.patch 0138-warpclock-Do-not-use-warpclock-module-on-S390-x-hwcl.patch 0139-dracut.sh-check-for-logfile-logfile-option-and-creat.patch 0140-dracut.sh-Avoid-duplicate-devices-in-host_devs.patch 0141-iscsi-Avoid-bad-ip-route-call-on-empty-address.patch 0143-iscsi-Fix-up-ipv6-in-brackets-iterate-over-all-possi.patch 0146-dracut.sh-corrected-logfile-check.patch 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch 0149-dracut.sh-Fix-fstab-parsing-again.patch 0151-Go-back-to-xz-again-pixz-may-use-too-much-memory-whi.patch 0152-Add-a-comment-to-easily-add-debug-modules-also-add-v.patch 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 0156-dracut.usage.asc-Remove-distro-specific-help-from-ma.patch 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch 0166-load-xhci-pci.patch 0167-do-not-symlink-var-log-to-run-log.patch 0169-fix-systemd-vconsole.patch dracut-037.tar.xz dracut_v37_to_HEAD.patch New: ---- dracut-041.tar.xz dracut_v041_to_HEAD.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -19,7 +19,7 @@ %define dracutlibdir %{_libexecdir}/dracut Name: dracut -Version: 037 +Version: 041 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0+ and LGPL-2.1+ @@ -30,171 +30,87 @@ Source4: purge-kernels Source5: purge-kernels.service Source6: dracut-installkernel -Patch1: dracut_v37_to_HEAD.patch -Patch2: 0001-kernel-modules-Fix-storage-module-selection-for-sdhc.patch +Patch1: dracut_v041_to_HEAD.patch + +# Sent mainline Patch11: 0011-Correct-paths-for-openSUSE.patch -Patch12: 0012-Check-for-plymouth-lib-directories.patch -Patch13: 0013-mkinitrd-suse-do-not-update-bootloader-if-no-kernel-.patch -Patch14: 0014-Update-dracut-manpage-for-GRUB-Legacy-and-GRUB2.patch +Patch12: 0019-40network-Fix-race-condition-when-wait-for-networks.patch +Patch13: 0066-40network-always-start-netroot-in-ifup.sh.patch +Patch14: 0068-95fcoe-uefi-Test-for-EFI-firmware.patch + +#Network: Patch15: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch -Patch16: 0016-Add-new-s390x-specific-rule-files.patch Patch17: 0017-45ifcfg-use-distro-specific-scripts.patch -Patch18: 0018-mkinitrd-suse-Fix-whitespaces-when-adding-drivers.patch -Patch19: 0019-40network-Fix-race-condition-when-wait-for-networks.patch -Patch20: 0020-00warpclock-Set-correct-timezone.patch -Patch21: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch -Patch22: 0022-95udev-rules-add-persistent-network-rule.patch -Patch23: 0023-systemd-always-tries-to-load-autofs4.patch -Patch24: 0024-Fixup-mdraid-setup.patch -Patch25: 0025-95udev-rules-Add-59-scsi-sg_utils.rules.patch -Patch26: 0026-90multipath-add-67-kpartx-compat.rules.patch -Patch27: 0027-90multipath-install-dracut-specific-service-file.patch -Patch28: 0028-95udev-rules-Include-correct-sg3_utils-rules.patch -Patch29: 0029-90multipath-install-correct-multipath-rules.patch -Patch30: 0030-95iscsi-Autodetect-iSCSI-firmware.patch -Patch31: 0031-90multipath-Fixup-service-file-for-booting.patch -Patch32: 0032-mkinitrd-suse.sh-Use-hostonly-and-hostonly-cmdline-c.patch -Patch33: 0033-95iscsi-Set-correct-iscsi_started-value-for-iSCSI-fi.patch -Patch34: 0034-dracut-Do-not-stop-installing-drivers-if-one-fails.patch -Patch35: 0035-Introduce-force-drivers-parameter-and-force_drivers-.patch -Patch36: 0036-95fcoe-Store-current-configuration-in-dracut-cmdline.patch -Patch37: 0037-95fcoe-update-fcoe-interface-check.patch -Patch38: 0038-95fcoe-start-lldpad-separately.patch -Patch39: 0039-Remove-force-parameter-from-mkinitrd.patch -Patch40: 0040-95fcoe-skip-VLAN-devices-in-fcoe-up.patch -Patch41: 0041-mkinitd-suse-remove-hostonly-and-hostonly-cmdline.patch -Patch42: 0042-Enhance-suse.conf-example-with-SUSE-specific-setting.patch -Patch43: 0043-40network-always-add-network-module.patch -Patch44: 0044-Add-find-to-debug-binaries.patch -Patch45: 0045-40network-add-missing-_arch-variable-declaration.patch -Patch46: 0046-dracut-Do-not-wait-for-swap-device.patch -Patch47: 0047-95resume-skip-module-for-s390-x.patch Patch48: 0048-40network-Only-enable-network-interfaces-if-explicit.patch -Patch49: 0049-95iscsi-Use-ip-ibft-for-ibft-autoconfiguration.patch -Patch50: 0050-95iscsi-strip-one-set-of-quotes-when-calling-initque.patch -Patch51: 0051-mkinitrd-suse-add-update-bootloader-message.patch -Patch52: 0052-99base-Add-chown-binary.patch -Patch53: 0053-01fips-fixup-loading-issues.patch -Patch54: 0054-95iscsi-update-commandline-printing.patch -Patch55: 0055-95fcoe-Only-install-fcoe-module-if-required.patch -Patch56: 0056-81cio_ignore-handle-cio_ignore-commandline.patch -Patch57: 0057-01fips-Include-some-more-hmacs.patch -Patch58: 0058-dracut-add-warning-when-including-unsupported-module.patch -Patch59: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch Patch60: 0060-45ifcfg-Add-SUSE-specific-write-ifcfg-file.patch Patch61: 0061-45ifcfg-Fixup-error-message-in-write-ifcfg-suse.patch -Patch62: 0062-95iscsi-Install-libgcc_s-library.patch -Patch63: 0063-90multipath-Install-libgcc_s-library.patch -Patch64: 0064-90kernel-modules-install-scsi_dh_alua.patch -Patch65: 0065-95iscsi-Fixup-bnx2i-offload-booting.patch -Patch66: 0066-40network-always-start-netroot-in-ifup.sh.patch -Patch67: 0067-95fcoe-check-always-returns-255.patch -Patch68: 0068-95fcoe-uefi-Test-for-EFI-firmware.patch -Patch69: 0069-81cio_ignore-skip-module-if-cio_ignore-is-not-active.patch -Patch70: 0070-81cio_ignore-rewrite-module.patch -Patch71: 0071-Fix-non-export-of-journal-dev-boot-options.patch -Patch72: 0072-Also-export-root-boot-param-for-hostonly-cmdline-cas.patch -Patch73: 0073-Don-t-create-lots-of-empty-cmdline-files-for-hostonl.patch -Patch74: 0074-More-empty-cmdline-fixes.patch +Patch89: 0089-40network-create-var-lib-wicked-in-ifup.sh.patch +Patch94: 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch +Patch124: 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch +Patch125: 0125-40network-separate-mask-and-prefix.patch +Patch131: 0131-40network-handle-prefixed-IP-addresses-correctly.patch +Patch132: 0132-40network-fixup-static-network-configuration.patch +Patch142: 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch +Patch159: 0159-network-Try-to-load-xennet.patch + +#S390 +Patch16: 0016-Add-new-s390x-specific-rule-files.patch +Patch21: 0021-95dcssblk-Add-new-module-for-DCSS-block-devices.patch +Patch56: 0056-81cio_ignore-handle-cio_ignore-commandline.patch Patch75: 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch Patch76: 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch -Patch77: 0077-90multipath-add-missing-11-dm-mpath.rules-file.patch -Patch78: 0078-Restore-original-IFS-value.patch Patch79: 0079-95dasd_rules-fixup-rd.dasd-parsing.patch Patch80: 0080-95dasd_rules-print-out-rd.dasd-commandline.patch Patch81: 0081-95dasd_mod-do-not-set-module-parameters-if-dasd_cio_.patch -Patch82: 0082-00warpclock-check-for-sbin-hwclock.patch Patch83: 0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch -Patch84: 0084-95rootfs-block-Correctly-terminate-commandline-param.patch Patch85: 0085-95zfcp_rules-print-out-rd.zfcp-commandline-parameter.patch Patch86: 0086-95zfcp_rules-Auto-generate-udev-rule-for-ipl-device.patch Patch87: 0087-95dasd_rules-Auto-generate-udev-rule-for-ipl-device.patch Patch88: 0088-91zipl-Add-new-module-to-update-s390x-configuration.patch -Patch89: 0089-40network-create-var-lib-wicked-in-ifup.sh.patch -Patch90: 0090-dracut-caps-Remove-whole-caps-module.patch -Patch91: 0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch -Patch92: 0092-dracut-nbd-Only-complain-of-missing-binary-in-hoston.patch -Patch93: 0093-95iscsi-generate-commandline-for-software-iscsi.patch -Patch94: 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch -Patch95: 0095-95iscsi-use-static-configuration-for-software-iscsi.patch -Patch96: 0096-dracut-Fix-error-local-can-only-be-used-in-a-functio.patch -Patch97: 0097-Implement-rd.timeout-to-modify-the-device-timeout.patch -Patch98: 0098-Do-not-call-lvm-for-non-LVM-device-mapper-devices.patch -Patch99: 0099-90multipath-Load-device_handler-modules-early-during.patch -Patch100: 0100-Add-btrfs-rescue-utilities.patch -Patch101: 0101-Print-stored-dracut-commandline-during-initramfs-bui.patch -Patch102: 0102-Align-dev_unit_name-with-systemd-s-function.patch -Patch103: 0103-Fixup-missing-separators-in-rootfs-block-cmdline.patch -Patch104: 0104-Generate-fallback-mount-unit-for-root-filesystem.patch -Patch105: 0105-95iscsi-parse-output-from-iscsiadm-correctly.patch -Patch106: 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch Patch107: 0107-Fixup-typo-firmare-instead-of-firmware.patch Patch108: 0108-91zipl-Store-commandline-correctly.patch Patch109: 0109-95dasd_rules-Store-all-devices-in-commandline.patch Patch110: 0110-95zfcp_rules-Store-all-devices-in-commandline.patch -Patch111: 0111-90mdraid-Remove-line-for-offroot-detection.patch -Patch112: 0112-99base-warn-on-invalid-command-for-initqueue.patch Patch113: 0113-91zipl-Install-script-as-executable.patch Patch114: 0114-91zipl-Translate-ext2-3-into-ext4.patch -Patch115: 0115-Handle-module-alias-properly.patch -Patch116: 0116-Mark-scripts-as-executable.patch Patch117: 0117-95dasd_rules-Enable-the-device-before-checking-devic.patch Patch118: 0118-95zfcp_rules-Enable-the-device-before-checking-devic.patch +Patch123: 0123-95zfcp_rules-fix-typo-in-module_setup.patch +Patch157: 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch + +#FIPS +Patch53: 0053-01fips-fixup-loading-issues.patch +Patch57: 0057-01fips-Include-some-more-hmacs.patch +Patch116: 0116-Mark-scripts-as-executable.patch +Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch +Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch + +# Others +Patch20: 0020-00warpclock-Set-correct-timezone.patch +Patch58: 0058-dracut-add-warning-when-including-unsupported-module.patch +Patch59: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch +Patch90: 0090-dracut-caps-Remove-whole-caps-module.patch +Patch91: 0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch +Patch106: 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch Patch119: 0119-Reset-IFS-variable.patch Patch120: 0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch Patch121: 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch -Patch122: 0122-btrfs-btrfs-dump-super-and-btrfs-select-super-do-not.patch -Patch123: 0123-95zfcp_rules-fix-typo-in-module_setup.patch -Patch124: 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch -Patch125: 0125-40network-separate-mask-and-prefix.patch -Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch -Patch127: 0127-99base-Increase-initqueue-timeout-in-non-systemd-cas.patch -Patch128: 0128-90lvm-Install-dm-snapshot-module.patch -Patch129: 0129-Revert-commit-6ecab258710d158a7a6-and-only-do-not-wa.patch Patch130: 0130-nfs-Always-add-all-kernel-modules-for-kdump.patch -Patch131: 0131-40network-handle-prefixed-IP-addresses-correctly.patch -Patch132: 0132-40network-fixup-static-network-configuration.patch -Patch133: 0133-Allow-multiple-configurations-per-network-interface-.patch -Patch134: 0134-Remove-bootdev-warning-bnc-881112.patch -Patch135: 0135-lvm-Fix-12819a579900b9691e2-check-for-existance-of-6.patch -Patch136: 0136-Revert-95udev-rules-add-persistent-network-rule.patch -Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch -Patch138: 0138-warpclock-Do-not-use-warpclock-module-on-S390-x-hwcl.patch -Patch139: 0139-dracut.sh-check-for-logfile-logfile-option-and-creat.patch -Patch140: 0140-dracut.sh-Avoid-duplicate-devices-in-host_devs.patch -Patch141: 0141-iscsi-Avoid-bad-ip-route-call-on-empty-address.patch -Patch142: 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch -Patch143: 0143-iscsi-Fix-up-ipv6-in-brackets-iterate-over-all-possi.patch Patch144: 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch -Patch145: 0145-40network-handle-ip-ifname-static-correctly.patch -Patch146: 0146-dracut.sh-corrected-logfile-check.patch -Patch147: 0147-dracut.sh-Fix-UUID-fstab-parsing-in-case-mount-optio.patch -Patch148: 0148-dracut.sh-Fix-LABEL-and-other-fstab-syntax.patch -Patch149: 0149-dracut.sh-Fix-fstab-parsing-again.patch 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 -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 -Patch159: 0159-network-Try-to-load-xennet.patch -Patch160: 0160-nfs-Add-ip-.-and-root-nfs.-parameters-to-internal-dr.patch -Patch161: 0161-Fix-error-message-when-there-are-no-internal-kernel-.patch -Patch162: 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch Patch163: 0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch Patch164: 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch Patch165: 0165-Order-root-fsck-after-pre-mount.patch -Patch166: 0166-load-xhci-pci.patch -Patch167: 0167-do-not-symlink-var-log-to-run-log.patch -# PATCH-FIX-OPENSUSE [email protected] -- remove PLYMOUTH_LOGO_FILE from modules.d/50plymouth/plymouth-populate-initrd.sh (bnc#910952) Patch168: 0168-remove_plymouth_logo_file.patch -Patch169: 0169-fix-systemd-vconsole.patch -# PATCH-FIX-UPSTREAM [email protected] -- Add logitech-hidpp module to default initrd, fixes (boo#918938) Patch170: 0170-enable-logitech-hidpp.patch +# Still needed +Patch133: 0133-Allow-multiple-configurations-per-network-interface-.patch +Patch134: 0134-Remove-bootdev-warning-bnc-881112.patch +Patch145: 0145-40network-handle-ip-ifname-static-correctly.patch +Patch162: 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch + BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -248,7 +164,6 @@ %prep %setup -q %patch1 -p1 -%patch2 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 @@ -256,73 +171,22 @@ %patch15 -p1 %patch16 -p1 %patch17 -p1 -%patch18 -p1 -%patch19 -p1 %patch20 -p1 %patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 -%patch37 -p1 -%patch38 -p1 -%patch39 -p1 -%patch40 -p1 -%patch41 -p1 -%patch42 -p1 -%patch43 -p1 -%patch44 -p1 -%patch45 -p1 -%patch46 -p1 -%patch47 -p1 %patch48 -p1 -%patch49 -p1 -%patch50 -p1 -%patch51 -p1 -%patch52 -p1 %patch53 -p1 -%patch54 -p1 -%patch55 -p1 %patch56 -p1 %patch57 -p1 %patch58 -p1 %patch59 -p1 %patch60 -p1 %patch61 -p1 -%patch62 -p1 -%patch63 -p1 -%patch64 -p1 -%patch65 -p1 -%patch66 -p1 -%patch67 -p1 -%patch68 -p1 -%patch69 -p1 -%patch70 -p1 -%patch71 -p1 -%patch72 -p1 -%patch73 -p1 -%patch74 -p1 %patch75 -p1 %patch76 -p1 -%patch77 -p1 -%patch78 -p1 %patch79 -p1 %patch80 -p1 %patch81 -p1 -%patch82 -p1 %patch83 -p1 -%patch84 -p1 %patch85 -p1 %patch86 -p1 %patch87 -p1 @@ -330,84 +194,45 @@ %patch89 -p1 %patch90 -p1 %patch91 -p1 -%patch92 -p1 -%patch93 -p1 %patch94 -p1 -%patch95 -p1 -%patch96 -p1 -%patch97 -p1 -%patch98 -p1 -%patch99 -p1 -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 -%patch103 -p1 -%patch104 -p1 -%patch105 -p1 %patch106 -p1 %patch107 -p1 %patch108 -p1 %patch109 -p1 %patch110 -p1 -%patch111 -p1 -%patch112 -p1 %patch113 -p1 %patch114 -p1 -%patch115 -p1 %patch116 -p1 %patch117 -p1 %patch118 -p1 %patch119 -p1 %patch120 -p1 %patch121 -p1 -%patch122 -p1 %patch123 -p1 %patch124 -p1 %patch125 -p1 %patch126 -p1 -%patch127 -p1 -%patch128 -p1 -%patch129 -p1 %patch130 -p1 %patch131 -p1 %patch132 -p1 -%patch133 -p1 -%patch134 -p1 -%patch135 -p1 -%patch136 -p1 + +# Still needed! +#%patch133 -p1 +#%patch134 -p1 +#%patch145 -p1 +#%patch162 -p1 + %patch137 -p1 -%patch138 -p1 -%patch139 -p1 -%patch140 -p1 -%patch141 -p1 %patch142 -p1 -%patch143 -p1 %patch144 -p1 -%patch145 -p1 -%patch146 -p1 -%patch147 -p1 -%patch148 -p1 -%patch149 -p1 %patch150 -p1 -%patch151 -p1 -%patch152 -p1 -%patch153 -p1 -%patch154 -p1 -%patch155 -p1 -%patch156 -p1 %patch157 -p1 %patch158 -p1 %patch159 -p1 -%patch160 -p1 -%patch161 -p1 -%patch162 -p1 %patch163 -p1 %patch164 -p1 %patch165 -p1 -%patch166 -p1 -%patch167 -p1 %patch168 -p1 -%patch169 -p1 %patch170 -p1 %build ++++++ 0011-Correct-paths-for-openSUSE.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/98systemd/rescue.service | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/dracut.sh b/dracut.sh -index c4163bc..adf26ad 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -774,7 +774,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l)) +Index: dracut-041/dracut.sh +=================================================================== +--- dracut-041.orig/dracut.sh 2015-03-16 17:47:39.671230783 +0100 ++++ dracut-041/dracut.sh 2015-03-16 17:47:45.231540139 +0100 +@@ -809,7 +809,7 @@ [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l [[ $lvmconf_l ]] && lvmconf=$lvmconf_l [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut @@ -26,11 +26,11 @@ [[ $tmpdir_l ]] && tmpdir="$tmpdir_l" [[ $tmpdir ]] || tmpdir=/var/tmp [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS -diff --git a/modules.d/98systemd/rescue.service b/modules.d/98systemd/rescue.service -index edc2461..d80900f 100644 ---- a/modules.d/98systemd/rescue.service -+++ b/modules.d/98systemd/rescue.service -@@ -16,7 +16,7 @@ Environment=HOME=/ +Index: dracut-041/modules.d/98systemd/rescue.service +=================================================================== +--- dracut-041.orig/modules.d/98systemd/rescue.service 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/98systemd/rescue.service 2015-03-16 17:47:45.235540363 +0100 +@@ -16,7 +16,7 @@ Environment=DRACUT_SYSTEMD=1 Environment=NEWROOT=/sysroot WorkingDirectory=/ @@ -39,6 +39,3 @@ ExecStart=-/bin/sh -i -l ExecStopPost=-/bin/rm -f -- /.console_lock ExecStopPost=-/usr/bin/systemctl --fail --no-block default --- -1.8.4.5 - ++++++ 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -20,15 +20,12 @@ delete mode 100644 modules.d/40network/dhclient.conf delete mode 100755 modules.d/40network/kill-dhclient.sh -diff --git a/modules.d/40network/dhclient-script.sh b/modules.d/40network/dhclient-script.sh -deleted file mode 100755 -index ba05250..0000000 ---- a/modules.d/40network/dhclient-script.sh -+++ /dev/null -@@ -1,156 +0,0 @@ +Index: dracut-041/modules.d/40network/dhclient-script.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/dhclient-script.sh 2015-03-17 12:02:54.894703848 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,154 +0,0 @@ -#!/bin/sh --# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- --# ex: ts=8 sw=4 sts=4 et filetype=sh - -PATH=/usr/sbin:/usr/bin:/sbin:/bin - @@ -73,7 +70,7 @@ - valid_lft ${lease_time} preferred_lft ${lease_time} \ - dev $netif - -- [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw +- [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw - - [ -n "${search}${domain}" ] && echo "search $search $domain" > /tmp/net.$netif.resolv.conf - if [ -n "$namesrv" ] ; then @@ -182,20 +179,19 @@ -esac - -exit 0 -diff --git a/modules.d/40network/dhclient.conf b/modules.d/40network/dhclient.conf -deleted file mode 100644 -index dbf5882..0000000 ---- a/modules.d/40network/dhclient.conf -+++ /dev/null +Index: dracut-041/modules.d/40network/dhclient.conf +=================================================================== +--- dracut-041.orig/modules.d/40network/dhclient.conf 2015-01-31 12:54:52.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -request subnet-mask, broadcast-address, time-offset, routers, - domain-name, domain-name-servers, domain-search, host-name, - root-path, interface-mtu; -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 7740be5..99d2ed4 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -88,21 +88,106 @@ else +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-17 12:27:22.361149708 +0100 +@@ -86,21 +86,106 @@ [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0 fi @@ -307,7 +303,7 @@ } load_ipv6() { -@@ -226,8 +311,6 @@ if [ -e /tmp/team.info ]; then +@@ -226,8 +311,6 @@ fi fi @@ -316,15 +312,12 @@ if [ -e /tmp/bridge.info ]; then . /tmp/bridge.info # start bridge if necessary -diff --git a/modules.d/40network/kill-dhclient.sh b/modules.d/40network/kill-dhclient.sh -deleted file mode 100755 -index 78060f5..0000000 ---- a/modules.d/40network/kill-dhclient.sh -+++ /dev/null -@@ -1,17 +0,0 @@ +Index: dracut-041/modules.d/40network/kill-dhclient.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/kill-dhclient.sh 2015-03-17 12:02:54.906704510 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,15 +0,0 @@ -#!/bin/sh --# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- --# ex: ts=8 sw=4 sts=4 et filetype=sh - -for f in /tmp/dhclient.*.pid; do - [ -e $f ] || continue @@ -339,13 +332,12 @@ - read PID < $f; - kill -9 $PID >/dev/null 2>&1 -done -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 1df4174..b54f873 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -2,11 +2,14 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh +Index: dracut-041/modules.d/40network/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/module-setup.sh 2015-03-17 12:02:55.006710127 +0100 ++++ dracut-041/modules.d/40network/module-setup.sh 2015-03-17 12:37:51.868466193 +0100 +@@ -1,10 +1,13 @@ + #!/bin/bash +WICKEDD_DHCP_PATH="/usr/lib/wicked/bin" +WICKED_EXT_PATH="/etc/wicked/extensions" @@ -359,7 +351,7 @@ return 255 } -@@ -72,16 +75,18 @@ installkernel() { +@@ -71,17 +74,18 @@ # called by dracut install() { local _arch _i _dir @@ -377,11 +369,12 @@ inst_script "$moddir/netroot.sh" "/sbin/netroot" - inst_script "$moddir/dhclient-script.sh" "/sbin/dhclient-script" inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh" -- inst_simple "$moddir/dhclient.conf" "/etc/dhclient.conf" +- inst_simple -H "/etc/dhclient.conf" +- cat "$moddir/dhclient.conf" >> "${initdir}/etc/dhclient.conf" inst_hook pre-udev 50 "$moddir/ifname-genrules.sh" inst_hook pre-udev 60 "$moddir/net-genrules.sh" inst_hook cmdline 91 "$moddir/dhcp-root.sh" -@@ -92,7 +97,6 @@ install() { +@@ -92,7 +96,6 @@ inst_hook cmdline 97 "$moddir/parse-bridge.sh" inst_hook cmdline 98 "$moddir/parse-ip-opts.sh" inst_hook cmdline 99 "$moddir/parse-ifname.sh" @@ -389,6 +382,3 @@ _arch=$(uname -m) --- -1.8.4.5 - ++++++ 0016-Add-new-s390x-specific-rule-files.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -15,11 +15,11 @@ modules.d/95zfcp_rules/module-setup.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/modules.d/95dasd_rules/module-setup.sh b/modules.d/95dasd_rules/module-setup.sh -index 51c315d..451fc25 100755 ---- a/modules.d/95dasd_rules/module-setup.sh -+++ b/modules.d/95dasd_rules/module-setup.sh -@@ -6,7 +6,7 @@ +Index: dracut-041/modules.d/95dasd_rules/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/95dasd_rules/module-setup.sh 2015-03-17 12:38:30.046605162 +0100 +@@ -4,7 +4,7 @@ check() { local _arch=$(uname -m) [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1 @@ -28,7 +28,7 @@ return 0 } -@@ -18,10 +18,10 @@ depends() { +@@ -16,10 +16,10 @@ # called by dracut install() { @@ -40,17 +40,14 @@ fi inst_rules 59-dasd.rules } -diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh -index d9879cb..849645c 100755 ---- a/modules.d/95zfcp_rules/module-setup.sh -+++ b/modules.d/95zfcp_rules/module-setup.sh -@@ -21,5 +21,6 @@ install() { +Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/95zfcp_rules/module-setup.sh 2015-03-17 12:38:30.050605397 +0100 +@@ -19,5 +19,6 @@ inst_hook cmdline 30 "$moddir/parse-zfcp.sh" if [[ $hostonly ]] ; then inst_rules_wildcard 51-zfcp-*.rules + inst_rules_wildcard 41-s390x-zfcp-*.rules fi } --- -1.8.1.4 - ++++++ 0017-45ifcfg-use-distro-specific-scripts.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -16,11 +16,11 @@ modules.d/45ifcfg/module-setup.sh | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 99d2ed4..934c61e 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -186,6 +186,7 @@ do_dhcp() { +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-17 12:38:28.586523363 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-17 12:38:48.851658757 +0100 +@@ -184,6 +184,7 @@ $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} dhcp_apply $1 || return $? @@ -28,11 +28,11 @@ echo $netif > /tmp/setup_net_${netif}.ok return 0 } -diff --git a/modules.d/45ifcfg/module-setup.sh b/modules.d/45ifcfg/module-setup.sh -index c407f45..164a580 100755 ---- a/modules.d/45ifcfg/module-setup.sh -+++ b/modules.d/45ifcfg/module-setup.sh -@@ -4,7 +4,13 @@ +Index: dracut-041/modules.d/45ifcfg/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/45ifcfg/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/45ifcfg/module-setup.sh 2015-03-17 12:38:48.851658757 +0100 +@@ -2,7 +2,13 @@ # called by dracut check() { @@ -47,6 +47,3 @@ return 255 } --- -1.8.4.5 - ++++++ 0019-40network-Fix-race-condition-when-wait-for-networks.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -17,11 +17,11 @@ modules.d/40network/net-genrules.sh | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index af2f09c..6ec9239 100755 ---- a/modules.d/40network/net-genrules.sh -+++ b/modules.d/40network/net-genrules.sh -@@ -98,6 +98,9 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh +Index: dracut-041/modules.d/40network/net-genrules.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/net-genrules.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/40network/net-genrules.sh 2015-03-17 12:38:55.044006007 +0100 +@@ -96,6 +96,9 @@ cond='ACTION=="add", SUBSYSTEM=="net"' # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules @@ -31,6 +31,3 @@ fi # if you change the name of "90-net.rules", also change modules.d/80cms/cmssetup.sh --- -1.8.1.4 - ++++++ 0020-00warpclock-Set-correct-timezone.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -15,19 +15,23 @@ create mode 100755 modules.d/00warpclock/module-setup.sh create mode 100755 modules.d/00warpclock/warpclock.sh -diff --git a/modules.d/00warpclock/module-setup.sh b/modules.d/00warpclock/module-setup.sh -new file mode 100755 -index 0000000..4d18795 ---- /dev/null -+++ b/modules.d/00warpclock/module-setup.sh -@@ -0,0 +1,22 @@ +Index: dracut-041/modules.d/00warpclock/module-setup.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ dracut-041/modules.d/00warpclock/module-setup.sh 2015-03-24 15:18:51.564135423 +0100 +@@ -0,0 +1,27 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh + +# called by dracut +check() { -+ [ -e /etc/localtime -a -e /etc/adjtime ] ++ # hwclock does not exist on S390(x), bail out silently then ++ local _arch=$(uname -m) ++ [ "$_arch" = "s390" -o "$_arch" = "s390x" ] && return 1 ++ ++ [ -e /etc/localtime -a -e /etc/adjtime ] || return 1 ++ require_binaries /sbin/hwclock || return 1 +} + +# called by dracut @@ -43,11 +47,10 @@ + inst_hook pre-trigger 00 "$moddir/warpclock.sh" + inst /sbin/hwclock +} -diff --git a/modules.d/00warpclock/warpclock.sh b/modules.d/00warpclock/warpclock.sh -new file mode 100755 -index 0000000..f64818c ---- /dev/null -+++ b/modules.d/00warpclock/warpclock.sh +Index: dracut-041/modules.d/00warpclock/warpclock.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ dracut-041/modules.d/00warpclock/warpclock.sh 2015-03-24 15:07:47.762852198 +0100 @@ -0,0 +1,9 @@ +#!/bin/sh + @@ -58,6 +61,3 @@ + fi + done < /etc/adjtime +fi --- -1.8.1.4 - ++++++ 0048-40network-Only-enable-network-interfaces-if-explicit.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -16,11 +16,11 @@ modules.d/40network/net-genrules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh -index 6ec9239..2fd8c6b 100755 ---- a/modules.d/40network/net-genrules.sh -+++ b/modules.d/40network/net-genrules.sh -@@ -97,8 +97,8 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh +Index: dracut-041/modules.d/40network/net-genrules.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/net-genrules.sh 2015-03-24 15:07:37.138255549 +0100 ++++ dracut-041/modules.d/40network/net-genrules.sh 2015-03-24 15:09:13.415662323 +0100 +@@ -95,8 +95,8 @@ else cond='ACTION=="add", SUBSYSTEM=="net"' # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh @@ -30,6 +30,3 @@ echo "[ -f /tmp/net.*.did-setup ]" >$hookdir/initqueue/finished/wait-network.sh fi fi --- -1.8.4.5 - ++++++ 0053-01fips-fixup-loading-issues.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/01fips/module-setup.sh | 12 +++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) -diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh -index 7fa48f1..07bd1da 100755 ---- a/modules.d/01fips/fips.sh -+++ b/modules.d/01fips/fips.sh -@@ -100,6 +100,18 @@ do_fips() +Index: dracut-041/modules.d/01fips/fips.sh +=================================================================== +--- dracut-041.orig/modules.d/01fips/fips.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/01fips/fips.sh 2015-03-17 12:57:54.755887866 +0100 +@@ -98,6 +98,18 @@ _found=1 break done </proc/crypto @@ -36,13 +36,13 @@ [ "$_found" = "0" ] && return 1 fi fi -diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index a4081dc..aa56fcf 100755 ---- a/modules.d/01fips/module-setup.sh -+++ b/modules.d/01fips/module-setup.sh -@@ -18,8 +18,12 @@ installkernel() { +Index: dracut-041/modules.d/01fips/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/01fips/module-setup.sh 2015-03-17 12:57:54.439870155 +0100 ++++ dracut-041/modules.d/01fips/module-setup.sh 2015-03-17 12:57:54.755887866 +0100 +@@ -16,8 +16,12 @@ _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 blowfish camellia cast6 cbc ccm " - _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod " + _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" @@ -55,9 +55,9 @@ mkdir -m 0755 -p "${initdir}/etc/modprobe.d" -@@ -44,7 +48,9 @@ install() { - libsoftokn3.chk libfreebl3.so libfreebl3.chk \ - libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 +@@ -43,7 +47,9 @@ + libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \ + libfreeblpriv3.so libfreeblpriv3.chk - inst_multiple -o prelink + # we do not use prelink at SUSE @@ -66,6 +66,3 @@ inst_simple /etc/system-fips } --- -1.8.4.5 - ++++++ 0056-81cio_ignore-handle-cio_ignore-commandline.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -1,24 +1,69 @@ -From 3e263f6bfa21d9b5b102dfa73d0bdf2c17de41dc Mon Sep 17 00:00:00 2001 From: Hannes Reinecke <[email protected]> -Date: Wed, 4 Jun 2014 13:27:41 +0200 -Subject: [PATCH] 81cio_ignore: handle cio_ignore commandline + +81cio_ignore: handle cio_ignore commandline References: bnc#874902 -Signed-off-by: Thomas Renninger <[email protected]> ---- - modules.d/81cio_ignore/module-setup.sh | 39 ++++++++++++++++++++++++++++++++++ - modules.d/81cio_ignore/parse-zipl.sh | 29 +++++++++++++++++++++++++ - 2 files changed, 68 insertions(+) - create mode 100644 modules.d/81cio_ignore/module-setup.sh - create mode 100644 modules.d/81cio_ignore/parse-zipl.sh +Incorporates following on-top patches/fixes: +---------------------------- +Subject: 81cio_ignore: skip module if cio_ignore is not active + +When cio_ignore is not active we should skip the entire module +during boot; otherwise it'll lead to adverse effects. + +References: bnc#882685 +---------------------------- +Subject: 81cio_ignore: rewrite module + +Rewrite cio_ignore module to rely on the dracut commandline +parameter 'rd.cio_accept', which takes a comma-separated list +of CCW IDs. Each of those IDs are being removed from the +list of devices from cio_ignore. + +The default values for rd.cio_accept are taken from +/boot/zipl/active_devices.txt. + +References: bnc#882685 +----------------------------- +Subject: More empty cmdline fixes + +This fixes up some more modules which might print out empty +commandline files. + +Signed-off-by: Thomas Renninger <[email protected]> +diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc +index e51fd1b..0e3e5a0 100644 +--- a/dracut.cmdline.7.asc ++++ b/dracut.cmdline.7.asc +@@ -857,6 +857,21 @@ NOTE: There must be enough free RAM available to hold the complete image. + This method is very suitable for diskless boots. + + ++CIO_IGNORE ++~~~~~~~~~~ ++**rd.cio_accept=**__<device-ids>__:: ++ Remove the devices listed in <device-ids> from the default ++ cio_ignore kernel command-line settings. ++ <device-ids> is a list of comma-separated CCW device ids. ++ The default for this value is taken from the ++ _/boot/zipl/active_devices.txt_ file. +++ ++[listing] ++.Example ++-- ++rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802 ++-- ++ + Plymouth Boot Splash + ~~~~~~~~~~~~~~~~~~~~ + **plymouth.enable=0**:: diff --git a/modules.d/81cio_ignore/module-setup.sh b/modules.d/81cio_ignore/module-setup.sh new file mode 100644 -index 0000000..a812649 +index 0000000..37b414b --- /dev/null +++ b/modules.d/81cio_ignore/module-setup.sh -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh @@ -26,73 +71,64 @@ +# called by dracut +check() { +# do not add this module by default -+ local arch=$(uname -m) -+ [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 -+ return 0 -+} -+ -+find_mount() { -+ local dev mnt etc wanted_dev -+ wanted_dev="$(readlink -e -q $1)" -+ while read dev mnt etc; do -+ [ "$mnt" = "$wanted_dev" ] && echo "$dev" && return 0 -+ done < /proc/mounts -+ return 1 ++ local arch=$(uname -m) ++ [ "$arch" = "s390" -o "$arch" = "s390x" ] || return 1 ++ return 0 +} + +cmdline() { -+ local zipl_dasd -+ zipl_dasd=`find_mount /boot/zipl` -+ printf " rd.zipl_dasd=%s\n" "$zipl_dasd " ++ local cio_accept ++ ++ if [ -e /boot/zipl/active_devices.txt ] ; then ++ while read dev etc ; do ++ [ "$dev" = "#" -o "$dev" = "" ] && continue; ++ if [ -z "$cio_accept" ] ; then ++ cio_accept="$dev" ++ else ++ cio_accept="${cio_accept},${dev}" ++ fi ++ done < /boot/zipl/active_devices.txt ++ fi ++ if [ -n "$cio_accept" ] ; then ++ echo "rd.cio_accept=${cio_accept}" ++ fi +} + +# called by dracut +install() { -+ if [[ $hostonly_cmdline == "yes" ]];then -+ echo $(cmdline) >"${initdir}/etc/cmdline.d/01zipl_dasd.conf" -+ fi ++ if [[ $hostonly_cmdline == "yes" ]] ; then ++ local _cio_accept=$(cmdline) ++ [[ $_cio_accept ]] && printf "%s\n" "$_cio_accept" >> "${initdir}/etc/cmdline.d/01cio_accept.conf" ++ fi + -+ inst_hook pre-mount 10 "$moddir/parse-zipl.sh" -+ inst_multiple cio_ignore mount umount mkdir ++ inst_hook cmdline 20 "$moddir/parse-cio_accept.sh" ++ inst_multiple cio_ignore +} -+installkernel() { -+ instmods ext4 -+} -diff --git a/modules.d/81cio_ignore/parse-zipl.sh b/modules.d/81cio_ignore/parse-zipl.sh +diff --git a/modules.d/81cio_ignore/parse-cio_accept.sh b/modules.d/81cio_ignore/parse-cio_accept.sh new file mode 100644 -index 0000000..5f7aa58 +index 0000000..4f899d2 --- /dev/null -+++ b/modules.d/81cio_ignore/parse-zipl.sh -@@ -0,0 +1,29 @@ ++++ b/modules.d/81cio_ignore/parse-cio_accept.sh +@@ -0,0 +1,22 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh + -+ZIPL_DEV="$(getarg rd.zipl_dasd)" -+ZIPL_DIR=/tmp/zipl -+CIO_REMOVE_LIST=$ZIPL_DIR/active_devices.txt -+ -+if [ -n $ZIPL_DEV ];then -+ info "Waiting for zipl device $ZIPL_DEV" -+ wait_for_dev -n "$ZIPL_DEV" -+# -+# mount device and read devices -+# -+ [ -d $ZIPL_DIR ] || mkdir $ZIPL_DIR -+ mount -t ext2 -o ro $ZIPL_DEV $ZIPL_DIR -+ if [ -f $CIO_REMOVE_LIST ] ; then -+# -+# File exist -+# -+ while read dev etc; do -+ [ "$dev" = "#" -o "$dev" = "" ] && continue -+ cio_ignore --remove $dev -+ done < $CIO_REMOVE_LIST -+ fi -+ umount $ZIPL_DIR -+else -+ warn "No rd.zipl_dasd boot parameter found" ++CIO_IGNORE=$(getarg cio_ignore) ++CIO_ACCEPT=$(getarg rd.cio_accept) ++ ++if [ -z $CIO_IGNORE ] ; then ++ info "cio_ignored disabled on commandline" ++ return ++fi ++if [ -n "$CIO_ACCEPT" ] ; then ++ OLDIFS="$IFS" ++ IFS=, ++ set -- $CIO_ACCEPT ++ while (($# > 0)) ; do ++ info "Enabling device $1" ++ cio_ignore --remove $1 ++ shift ++ done ++ IFS="$OLDIFS" +fi --- -1.8.4.5 - ++++++ 0057-01fips-Include-some-more-hmacs.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -12,23 +12,18 @@ modules.d/01fips/module-setup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index aa56fcf..d6907a3 100755 ---- a/modules.d/01fips/module-setup.sh -+++ b/modules.d/01fips/module-setup.sh -@@ -46,7 +46,11 @@ install() { - +Index: dracut-041/modules.d/01fips/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/01fips/module-setup.sh 2015-03-17 13:00:19.375997364 +0100 ++++ dracut-041/modules.d/01fips/module-setup.sh 2015-03-17 13:02:40.739924966 +0100 +@@ -45,6 +45,10 @@ inst_libdir_file libsoftokn3.so libsoftokn3.so \ libsoftokn3.chk libfreebl3.so libfreebl3.chk \ -- libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 -+ libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \ + libssl.so 'hmaccalc/sha512hmac.hmac' libssl.so.10 \ + .libcrypto.so.1.0.0.hmac .libssl.so.1.0.0.hmac \ + .libcryptsetup.so.4.5.0.hmac .libcryptsetup.so.4.hmac \ + .libgcrypt.so.20.hmac \ + .libfipscheck.so.1.hmac .libfipscheck.so.1.1.0.hmac + libfreeblpriv3.so libfreeblpriv3.chk # we do not use prelink at SUSE - #inst_multiple -o prelink --- -1.8.4.5 - ++++++ 0058-dracut-add-warning-when-including-unsupported-module.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -25,11 +25,11 @@ dracut.sh | 5 +++++ 3 files changed, 37 insertions(+) -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 5b3b1fb..1e0779a 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1400,6 +1400,17 @@ for_each_module_dir() { +Index: dracut-041/dracut-functions.sh +=================================================================== +--- dracut-041.orig/dracut-functions.sh 2015-03-17 13:03:05.977340283 +0100 ++++ dracut-041/dracut-functions.sh 2015-03-17 13:04:36.570421062 +0100 +@@ -1436,6 +1436,17 @@ done } @@ -47,7 +47,7 @@ # Install a single kernel module along with any firmware it may require. # $1 = full path to kernel module to install install_kmod_with_fw() { -@@ -1462,6 +1473,10 @@ install_kmod_with_fw() { +@@ -1498,6 +1509,10 @@ fi fi done @@ -58,7 +58,7 @@ return 0 } -@@ -1508,6 +1523,12 @@ dracut_kernel_post() { +@@ -1544,6 +1559,12 @@ inst_simple "$_modpath" "/lib/modules/$kernel/${_destpath}" || exit $? done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep" fi @@ -71,13 +71,13 @@ ) & _pid=$(jobs -p | while read a ; do printf ":$a";done) _pid=${_pid##*:} -diff --git a/dracut.8.asc b/dracut.8.asc -index 5ff0e82..39cbb98 100644 ---- a/dracut.8.asc -+++ b/dracut.8.asc -@@ -456,6 +456,17 @@ will not be able to boot. - Regenerate all initramfs images at the default location with the kernel - versions found on the system. Additional parameters are passed through. +Index: dracut-041/dracut.8.asc +=================================================================== +--- dracut-041.orig/dracut.8.asc 2015-03-17 13:03:05.985340731 +0100 ++++ dracut-041/dracut.8.asc 2015-03-17 13:04:36.574421286 +0100 +@@ -465,6 +465,17 @@ + **--loginstall _<DIR>_:: + Log all files installed from the host to _<DIR>_. +**--check-supported**:: + The kernel may be configured to check whether a module is @@ -93,36 +93,33 @@ FILES ----- _/var/log/dracut.log_:: -diff --git a/dracut.sh b/dracut.sh -index 79a6840..a58e134 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -193,6 +193,9 @@ Creates initial ramdisk images for preloading modules +Index: dracut-041/dracut.sh +=================================================================== +--- dracut-041.orig/dracut.sh 2015-03-17 13:04:36.578421510 +0100 ++++ dracut-041/dracut.sh 2015-03-17 13:05:51.022596862 +0100 +@@ -193,6 +193,9 @@ --printsize Print out the module install size --sshkey [SSHKEY] Add ssh key to initramfs (use with ssh-client module) --logfile [FILE] Logfile to use (overrides configuration setting) + --check-supported Check to ensure that modules are marked supported when + using a kernel that is configured to check the + support status of a module before loading. + --reproducible Create reproducible images + --loginstall [DIR] Log all files installed from the host to [DIR] - If [LIST] has multiple arguments, then you have to put these in quotes. - -@@ -374,6 +377,7 @@ rearrange_params() +@@ -387,6 +390,7 @@ --long noimageifnotneeded \ --long early-microcode \ --long no-early-microcode \ + --long check-supported \ + --long reproducible \ + --long loginstall: \ -- "$@") - - if (( $? != 0 )); then -@@ -557,6 +561,7 @@ while :; do +@@ -576,6 +580,7 @@ --printsize) printsize="yes";; --regenerate-all) regenerate_all="yes";; --noimageifnotneeded) noimageifnotneeded="yes";; + --check-supported) check_supported="yes" ;; - + --reproducible) reproducible_l="yes";; --) shift; break;; --- -1.8.4.5 - ++++++ 0066-40network-always-start-netroot-in-ifup.sh.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -16,13 +16,13 @@ modules.d/40network/ifup.sh | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 934c61e..494017b 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -420,21 +420,15 @@ for p in $(getargs ip=); do - do_static ;; - esac +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-24 15:07:37.946300922 +0100 +@@ -338,21 +338,15 @@ + esac + done - > /tmp/net.${netif}.up + if [ $? -eq 0 ]; then @@ -50,6 +50,3 @@ exit 0 done --- -1.8.4.5 - ++++++ 0068-95fcoe-uefi-Test-for-EFI-firmware.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -14,11 +14,11 @@ modules.d/95fcoe-uefi/module-setup.sh | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/modules.d/95fcoe-uefi/module-setup.sh b/modules.d/95fcoe-uefi/module-setup.sh -index 0fb06e2..f5277f4 100755 ---- a/modules.d/95fcoe-uefi/module-setup.sh -+++ b/modules.d/95fcoe-uefi/module-setup.sh -@@ -4,6 +4,9 @@ +Index: dracut-041/modules.d/95fcoe-uefi/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95fcoe-uefi/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/95fcoe-uefi/module-setup.sh 2015-03-24 15:07:41.762515236 +0100 +@@ -2,6 +2,9 @@ # called by dracut check() { @@ -28,6 +28,3 @@ require_binaries dcbtool fipvlan lldpad ip readlink || return 1 return 0 } --- -1.8.4.5 - ++++++ 0075-95dasd_rules-enable-parsing-of-rd.dasd-commandline-p.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -11,11 +11,11 @@ modules.d/95dasd_rules/parse-dasd.sh | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) -diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh -index 9389c44..a0ba1ff 100755 ---- a/modules.d/95dasd_rules/parse-dasd.sh -+++ b/modules.d/95dasd_rules/parse-dasd.sh -@@ -54,3 +54,40 @@ for dasd_arg in $(getargs root=) $(getargs resume=); do +Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:13:29.674054260 +0100 ++++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:13:36.566441368 +0100 +@@ -52,3 +52,40 @@ fi ) done @@ -56,6 +56,3 @@ + done + ) +done --- -1.8.4.5 - ++++++ 0076-Correctly-set-cio_ignore-for-dynamic-s390-rules.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/95zfcp_rules/parse-zfcp.sh | 3 +++ 2 files changed, 6 insertions(+) -diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh -index a0ba1ff..94a4b30 100755 ---- a/modules.d/95dasd_rules/parse-dasd.sh -+++ b/modules.d/95dasd_rules/parse-dasd.sh -@@ -38,6 +38,9 @@ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw % +Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:13:36.566441368 +0100 ++++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:13:39.238591451 +0100 +@@ -36,6 +36,9 @@ ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$_drv", IMPORT{program}="collect $ccw %k ${ccw} $_drv" ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1" EOF @@ -27,11 +27,11 @@ } for dasd_arg in $(getargs root=) $(getargs resume=); do -diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh -index 24dbdd3..8538ae3 100755 ---- a/modules.d/95zfcp_rules/parse-zfcp.sh -+++ b/modules.d/95zfcp_rules/parse-zfcp.sh -@@ -37,6 +37,9 @@ EOF +Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-24 15:13:26.593881271 +0100 ++++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-24 15:13:39.238591451 +0100 +@@ -35,6 +35,9 @@ ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun" EOF fi @@ -41,6 +41,3 @@ } for zfcp_arg in $(getargs rd.zfcp); do --- -1.8.4.5 - ++++++ 0079-95dasd_rules-fixup-rd.dasd-parsing.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -12,11 +12,11 @@ modules.d/95dasd_rules/parse-dasd.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) -diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh -index 02b4aea..43ca87a 100755 ---- a/modules.d/95dasd_rules/parse-dasd.sh -+++ b/modules.d/95dasd_rules/parse-dasd.sh -@@ -31,6 +31,10 @@ create_udev_rule() { +Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-17 13:19:07.747002492 +0100 ++++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-17 13:19:29.908237657 +0100 +@@ -29,6 +29,10 @@ esac [ -z "${_drv}" ] && return 0 @@ -27,7 +27,7 @@ [ -e ${_rule} ] && return 0 cat > $_rule <<EOF -@@ -38,9 +42,6 @@ ACTION=="add", SUBSYSTEM=="ccw", KERNEL=="$ccw", IMPORT{program}="collect $ccw % +@@ -36,9 +40,6 @@ ACTION=="add", SUBSYSTEM=="drivers", KERNEL=="$_drv", IMPORT{program}="collect $ccw %k ${ccw} $_drv" ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1" EOF @@ -37,7 +37,7 @@ } for dasd_arg in $(getargs root=) $(getargs resume=); do -@@ -48,7 +49,7 @@ for dasd_arg in $(getargs root=) $(getargs resume=); do +@@ -46,7 +47,7 @@ case $dasd_arg in /dev/disk/by-path/ccw-*) ccw_arg=${dasd_arg##*/} @@ -45,11 +45,11 @@ + ;; esac if [ -n "$ccw_arg" ] ; then - OLDIFS="$IFS" -@@ -79,8 +80,8 @@ for dasd_arg in $(getargs rd.dasd=); do + IFS="-" +@@ -75,8 +76,8 @@ end=${1#0.0.} shift - IFS="$OLDIFS" + unset IFS - for dev in $(seq $(( 10#$start )) $(( 10#$end )) ) ; do - create_udev_rule $(printf "0.0.%04d" "$dev") + for dev in $(seq $(( 16#$start )) $(( 16#$end )) ) ; do @@ -57,7 +57,7 @@ done ;; *) -@@ -89,7 +90,7 @@ for dasd_arg in $(getargs rd.dasd=); do +@@ -85,7 +86,7 @@ ro=1 fi dev=${dev#0.0.} @@ -66,6 +66,3 @@ shift ;; esac --- -1.8.4.5 - ++++++ 0080-95dasd_rules-print-out-rd.dasd-commandline.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -14,12 +14,12 @@ modules.d/95dasd_rules/module-setup.sh | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) -diff --git a/modules.d/95dasd_rules/module-setup.sh b/modules.d/95dasd_rules/module-setup.sh -index 451fc25..e4736a2 100755 ---- a/modules.d/95dasd_rules/module-setup.sh -+++ b/modules.d/95dasd_rules/module-setup.sh -@@ -3,10 +3,39 @@ - # ex: ts=8 sw=4 sts=4 et filetype=sh +Index: dracut-041/modules.d/95dasd_rules/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/module-setup.sh 2015-03-17 13:19:49.341320467 +0100 ++++ dracut-041/modules.d/95dasd_rules/module-setup.sh 2015-03-17 13:19:49.873350116 +0100 +@@ -1,10 +1,39 @@ + #!/bin/bash # called by dracut +cmdline() { @@ -58,7 +58,7 @@ return 0 } -@@ -19,6 +48,10 @@ depends() { +@@ -17,6 +46,10 @@ # called by dracut install() { inst_hook cmdline 30 "$moddir/parse-dasd.sh" @@ -69,6 +69,3 @@ if [[ $hostonly ]] ; then inst_rules_wildcard 51-dasd-*.rules inst_rules_wildcard 41-s390x-dasd-*.rules --- -1.8.4.5 - ++++++ 0081-95dasd_mod-do-not-set-module-parameters-if-dasd_cio_.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -12,11 +12,11 @@ modules.d/95dasd_mod/parse-dasd-mod.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/modules.d/95dasd_mod/parse-dasd-mod.sh b/modules.d/95dasd_mod/parse-dasd-mod.sh -index 0236d12..0b8adef 100755 ---- a/modules.d/95dasd_mod/parse-dasd-mod.sh -+++ b/modules.d/95dasd_mod/parse-dasd-mod.sh -@@ -9,7 +9,7 @@ done +Index: dracut-041/modules.d/95dasd_mod/parse-dasd-mod.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_mod/parse-dasd-mod.sh 2015-03-24 15:14:11.284391294 +0100 ++++ dracut-041/modules.d/95dasd_mod/parse-dasd-mod.sh 2015-03-24 15:14:27.173283690 +0100 +@@ -7,7 +7,7 @@ mod_args="${mod_args#*,}" @@ -25,6 +25,3 @@ [ -d /etc/modprobe.d ] || mkdir -m 0755 -p /etc/modprobe.d echo "options dasd_mod dasd=$mod_args" >> /etc/modprobe.d/dasd_mod.conf fi --- -1.8.4.5 - ++++++ 0083-95zfcp_rules-Fixup-rd.zfcp-parsing.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -11,11 +11,11 @@ modules.d/95zfcp_rules/parse-zfcp.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh -index 56152da..bb5cd3a 100755 ---- a/modules.d/95zfcp_rules/parse-zfcp.sh -+++ b/modules.d/95zfcp_rules/parse-zfcp.sh -@@ -7,9 +7,7 @@ create_udev_rule() { +Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 13:20:19.735014330 +0100 ++++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 13:20:19.835019903 +0100 +@@ -5,9 +5,7 @@ local wwpn=$2 local lun=$3 local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules @@ -25,7 +25,7 @@ if [ -e /sys/bus/ccw/devices/${ccw} ] ; then read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype -@@ -22,6 +20,10 @@ create_udev_rule() { +@@ -20,6 +18,10 @@ return 0; fi @@ -36,7 +36,7 @@ [ -e ${_rule} ] && return 0 if [ ! -f "$_rule" ] ; then -@@ -37,9 +39,6 @@ EOF +@@ -35,9 +37,6 @@ ACTION=="add", KERNEL=="rport-*", ATTR{port_name}=="$wwpn", SUBSYSTEMS=="ccw", KERNELS=="$ccw", ATTR{[ccw/$ccw]$wwpn/unit_add}="$lun" EOF fi @@ -46,7 +46,7 @@ } for zfcp_arg in $(getargs rd.zfcp); do -@@ -55,7 +54,7 @@ for zfcp_arg in $(getargs root=) $(getargs resume=); do +@@ -53,7 +52,7 @@ case $zfcp_arg in /dev/disk/by-path/ccw-*) ccw_arg=${zfcp_arg##*/} @@ -54,7 +54,4 @@ + ;; esac if [ -n "$ccw_arg" ] ; then - OLDIFS="$IFS" --- -1.8.4.5 - + IFS="-" ++++++ 0085-95zfcp_rules-print-out-rd.zfcp-commandline-parameter.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -11,12 +11,12 @@ modules.d/95zfcp_rules/module-setup.sh | 39 +++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) -diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh -index 849645c..3f80754 100755 ---- a/modules.d/95zfcp_rules/module-setup.sh -+++ b/modules.d/95zfcp_rules/module-setup.sh -@@ -3,10 +3,40 @@ - # ex: ts=8 sw=4 sts=4 et filetype=sh +Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh 2015-03-17 13:20:39.928139743 +0100 ++++ dracut-041/modules.d/95zfcp_rules/module-setup.sh 2015-03-17 13:20:40.528173186 +0100 +@@ -1,10 +1,40 @@ + #!/bin/bash # called by dracut +cmdline() { @@ -57,7 +57,7 @@ return 0 } -@@ -19,6 +49,13 @@ depends() { +@@ -17,6 +47,13 @@ install() { inst_multiple /usr/lib/udev/collect inst_hook cmdline 30 "$moddir/parse-zfcp.sh" @@ -71,6 +71,3 @@ if [[ $hostonly ]] ; then inst_rules_wildcard 51-zfcp-*.rules inst_rules_wildcard 41-s390x-zfcp-*.rules --- -1.8.4.5 - ++++++ 0086-95zfcp_rules-Auto-generate-udev-rule-for-ipl-device.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -11,11 +11,11 @@ modules.d/95zfcp_rules/parse-zfcp.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) -diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh -index bb5cd3a..05c1ed0 100755 ---- a/modules.d/95zfcp_rules/parse-zfcp.sh -+++ b/modules.d/95zfcp_rules/parse-zfcp.sh -@@ -41,6 +41,17 @@ EOF +Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 13:21:03.397447784 +0100 ++++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 13:29:52.590839805 +0100 +@@ -39,6 +39,17 @@ fi } @@ -32,8 +32,8 @@ + for zfcp_arg in $(getargs rd.zfcp); do ( - local IFS="," -@@ -51,6 +62,9 @@ done + IFS="," +@@ -49,6 +60,9 @@ for zfcp_arg in $(getargs root=) $(getargs resume=); do ( @@ -43,10 +43,10 @@ case $zfcp_arg in /dev/disk/by-path/ccw-*) ccw_arg=${zfcp_arg##*/} -@@ -61,8 +75,8 @@ for zfcp_arg in $(getargs root=) $(getargs resume=); do +@@ -57,8 +71,8 @@ + if [ -n "$ccw_arg" ] ; then IFS="-" set -- $ccw_arg - IFS="$OLDIFS" - wwpn=${4%:*} - lun=${4#*:} + _wwpn=${4%:*} @@ -54,6 +54,3 @@ create_udev_rule $2 $wwpn $lun fi ) --- -1.8.4.5 - ++++++ 0087-95dasd_rules-Auto-generate-udev-rule-for-ipl-device.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:17.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:17.000000000 +0200 @@ -11,11 +11,11 @@ modules.d/95dasd_rules/parse-dasd.sh | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh -index 43ca87a..7b6a3d2 100755 ---- a/modules.d/95dasd_rules/parse-dasd.sh -+++ b/modules.d/95dasd_rules/parse-dasd.sh -@@ -44,6 +44,15 @@ ACTION=="add", ENV{COLLECT_$ccw}=="0", ATTR{[ccw/$ccw]online}="1" +Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:15:10.763731992 +0100 ++++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:15:19.484221789 +0100 +@@ -42,6 +42,15 @@ EOF } @@ -31,6 +31,3 @@ for dasd_arg in $(getargs root=) $(getargs resume=); do ( case $dasd_arg in --- -1.8.4.5 - ++++++ 0088-91zipl-Add-new-module-to-update-s390x-configuration.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -19,11 +19,11 @@ create mode 100644 modules.d/91zipl/module-setup.sh create mode 100644 modules.d/91zipl/parse-zipl.sh -diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc -index 0f1ef82..c7508ca 100644 ---- a/dracut.cmdline.7.asc -+++ b/dracut.cmdline.7.asc -@@ -726,6 +726,20 @@ CIO_IGNORE +Index: dracut-041/dracut.cmdline.7.asc +=================================================================== +--- dracut-041.orig/dracut.cmdline.7.asc 2015-03-24 15:15:10.423712894 +0100 ++++ dracut-041/dracut.cmdline.7.asc 2015-03-24 15:15:22.356383108 +0100 +@@ -872,6 +872,20 @@ rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802 -- @@ -44,11 +44,10 @@ Plymouth Boot Splash ~~~~~~~~~~~~~~~~~~~~ **plymouth.enable=0**:: -diff --git a/modules.d/91zipl/install_zipl_cmdline.sh b/modules.d/91zipl/install_zipl_cmdline.sh -new file mode 100644 -index 0000000..8b454b8 ---- /dev/null -+++ b/modules.d/91zipl/install_zipl_cmdline.sh +Index: dracut-041/modules.d/91zipl/install_zipl_cmdline.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ dracut-041/modules.d/91zipl/install_zipl_cmdline.sh 2015-03-24 15:15:22.356383108 +0100 @@ -0,0 +1,33 @@ +#!/bin/bash + @@ -83,11 +82,10 @@ +> /tmp/install.zipl.cmdline-done + +exit 0 -diff --git a/modules.d/91zipl/module-setup.sh b/modules.d/91zipl/module-setup.sh -new file mode 100644 -index 0000000..a8d95c5 ---- /dev/null -+++ b/modules.d/91zipl/module-setup.sh +Index: dracut-041/modules.d/91zipl/module-setup.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ dracut-041/modules.d/91zipl/module-setup.sh 2015-03-24 15:15:22.356383108 +0100 @@ -0,0 +1,45 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- @@ -134,11 +132,10 @@ + fi + dracut_need_initqueue +} -diff --git a/modules.d/91zipl/parse-zipl.sh b/modules.d/91zipl/parse-zipl.sh -new file mode 100644 -index 0000000..f8c2ca4 ---- /dev/null -+++ b/modules.d/91zipl/parse-zipl.sh +Index: dracut-041/modules.d/91zipl/parse-zipl.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ dracut-041/modules.d/91zipl/parse-zipl.sh 2015-03-24 15:15:22.356383108 +0100 @@ -0,0 +1,41 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- @@ -181,6 +178,3 @@ + fi + wait_for_dev -n "$zipl_arg" +fi --- -1.8.4.5 - ++++++ 0089-40network-create-var-lib-wicked-in-ifup.sh.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/40network/ifup.sh | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 494017b..6f279a4 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -20,6 +20,8 @@ netif=$1 +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-24 15:15:10.003689302 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-24 15:15:25.332550269 +0100 +@@ -18,6 +18,8 @@ use_bridge='false' use_vlan='false' @@ -26,6 +26,3 @@ # enslave this interface to bond? for i in /tmp/bond.*.info; do [ -e "$i" ] || continue --- -1.8.4.5 - ++++++ 0090-dracut-caps-Remove-whole-caps-module.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -17,11 +17,10 @@ delete mode 100755 modules.d/02caps/caps.sh delete mode 100755 modules.d/02caps/module-setup.sh -diff --git a/modules.d/02caps/README b/modules.d/02caps/README -deleted file mode 100644 -index 34e0f02..0000000 ---- a/modules.d/02caps/README -+++ /dev/null +Index: dracut-041/modules.d/02caps/README +=================================================================== +--- dracut-041.orig/modules.d/02caps/README 2015-01-31 12:54:52.000000000 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -This adds the following parameters: -rd.caps=1 @@ -56,15 +55,12 @@ - jbd mbcache sd_mod crc_t10dif sr_mod cdrom ata_generic pata_acpi ata_piix - dm_mod" \ - /boot/initramfs-caps.img -diff --git a/modules.d/02caps/caps.sh b/modules.d/02caps/caps.sh -deleted file mode 100755 -index 6a8fe5d..0000000 ---- a/modules.d/02caps/caps.sh -+++ /dev/null -@@ -1,36 +0,0 @@ +Index: dracut-041/modules.d/02caps/caps.sh +=================================================================== +--- dracut-041.orig/modules.d/02caps/caps.sh 2015-03-17 13:30:53.230199929 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,34 +0,0 @@ -#!/bin/bash --# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- --# ex: ts=8 sw=4 sts=4 et filetype=sh - -capsmode=$(getarg rd.caps) - @@ -98,15 +94,12 @@ - info "Will drop capabilities $CAPS_INIT_DROP from init." -fi - -diff --git a/modules.d/02caps/module-setup.sh b/modules.d/02caps/module-setup.sh -deleted file mode 100755 -index 46e35a0..0000000 ---- a/modules.d/02caps/module-setup.sh -+++ /dev/null -@@ -1,26 +0,0 @@ +Index: dracut-041/modules.d/02caps/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/02caps/module-setup.sh 2015-03-17 13:30:53.238200386 +0100 ++++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +@@ -1,24 +0,0 @@ -#!/bin/bash --# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- --# ex: ts=8 sw=4 sts=4 et filetype=sh - -# called by dracut -check() { @@ -130,6 +123,3 @@ - fi -} - --- -1.8.4.5 - ++++++ 0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -12,11 +12,11 @@ modules.d/97biosdevname/module-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/modules.d/97biosdevname/module-setup.sh b/modules.d/97biosdevname/module-setup.sh -index e285a7f..41ee39f 100755 ---- a/modules.d/97biosdevname/module-setup.sh -+++ b/modules.d/97biosdevname/module-setup.sh -@@ -5,7 +5,8 @@ +Index: dracut-041/modules.d/97biosdevname/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/97biosdevname/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/97biosdevname/module-setup.sh 2015-03-24 15:15:31.680906812 +0100 +@@ -3,7 +3,8 @@ # called by dracut check() { [[ "$mount_needs" ]] && return 1 @@ -26,6 +26,3 @@ return 0 } --- -1.8.4.5 - ++++++ 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -15,11 +15,11 @@ modules.d/40network/parse-ip-opts.sh | 8 +++++++- 3 files changed, 24 insertions(+), 2 deletions(-) -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 6f279a4..f3e07a6 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -399,6 +399,18 @@ for p in $(getargs ip=); do +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-17 17:19:54.375944711 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-17 17:24:27.803263036 +0100 +@@ -399,6 +399,18 @@ [ "$use_bridge" != 'true' ] && \ [ "$use_vlan" != 'true' ] && continue @@ -38,20 +38,20 @@ # setup nameserver namesrv="$dns1 $dns2 $(getargs nameserver)" for s in $namesrv; do -@@ -411,7 +423,7 @@ for p in $(getargs ip=); do - done > /tmp/net.$netif.override +@@ -412,7 +424,7 @@ - case $autoconf in -- dhcp|on|any) -+ dhcp4|dhcp|on|any) - do_dhcp -4 ;; - dhcp6) - load_ipv6 -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 7e7f087..690ff08 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -101,6 +101,10 @@ install() { + for autoopt in $(str_replace "$autoconf" "," " "); do + case $autoopt in +- dhcp|on|any) ++ dhcp4|dhcp|on|any) + do_dhcp -4 ;; + dhcp6) + load_ipv6 +Index: dracut-041/modules.d/40network/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/module-setup.sh 2015-03-17 17:19:54.383945160 +0100 ++++ dracut-041/modules.d/40network/module-setup.sh 2015-03-17 17:24:05.189997137 +0100 +@@ -99,6 +99,10 @@ _arch=$(uname -m) @@ -62,25 +62,22 @@ inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \ {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*" -diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index 7e73574..e48b0f3 100755 ---- a/modules.d/40network/parse-ip-opts.sh -+++ b/modules.d/40network/parse-ip-opts.sh -@@ -64,7 +64,13 @@ for p in $(getargs ip=); do - # Error checking for autoconf in combination with other values - case $autoconf in - error) die "Error parsing option 'ip=$p'";; -- bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";; -+ bootp|rarp|both) die "Sorry, ip=$autoconf is currently unsupported";; -+ static) -+ if [ ! -e /etc/sysconfig/network/ifcfg-${dev} ] ; then -+ warn "No ifcfg configuration present for interface $dev, skipping" -+ continue -+ fi +Index: dracut-041/modules.d/40network/parse-ip-opts.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/parse-ip-opts.sh 2015-03-17 17:24:05.193997361 +0100 ++++ dracut-041/modules.d/40network/parse-ip-opts.sh 2015-03-17 17:26:56.711605514 +0100 +@@ -67,7 +67,13 @@ + for autoopt in $(str_replace "$autoconf" "," " "); do + case $autoopt in + error) die "Error parsing option 'ip=$p'";; +- bootp|rarp|both) die "Sorry, ip=$autoopt is currenty unsupported";; ++ bootp|rarp|both) die "Sorry, ip=$autoopt is currently unsupported";; ++ static) ++ if [ ! -e /etc/sysconfig/network/ifcfg-${dev} ] ; then ++ warn "No ifcfg configuration present for interface $dev, skipping" ++ continue ++ fi + ;; - none|off) - [ -z "$ip" ] && \ - die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense" --- -1.8.4.5 - + none|off) + [ -z "$ip" ] && \ + die "For argument 'ip=$p'\nValue '$autoopt' without static configuration does not make sense" ++++++ 0106-dracut-Enable-converting-of-directory-var-run-var-lo.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -19,11 +19,11 @@ 4 files changed, 79 insertions(+), 11 deletions(-) create mode 100755 modules.d/30convertfs/convertrunfs.sh -diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh -index d717c69..525b1e7 100755 ---- a/modules.d/30convertfs/convertfs.sh -+++ b/modules.d/30convertfs/convertfs.sh -@@ -64,15 +64,6 @@ if [[ ! -e "$testfile" ]]; then +Index: dracut-041/modules.d/30convertfs/convertfs.sh +=================================================================== +--- dracut-041.orig/modules.d/30convertfs/convertfs.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/30convertfs/convertfs.sh 2015-03-17 17:37:15.774237322 +0100 +@@ -62,15 +62,6 @@ fi rm -f -- "$testfile" @@ -39,11 +39,10 @@ find_mount() { local dev mnt etc wanted_dev wanted_dev="$(readlink -e -q $1)" -diff --git a/modules.d/30convertfs/convertrunfs.sh b/modules.d/30convertfs/convertrunfs.sh -new file mode 100755 -index 0000000..52700cd ---- /dev/null -+++ b/modules.d/30convertfs/convertrunfs.sh +Index: dracut-041/modules.d/30convertfs/convertrunfs.sh +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ dracut-041/modules.d/30convertfs/convertrunfs.sh 2015-03-17 17:37:15.778237383 +0100 @@ -0,0 +1,54 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- @@ -96,16 +95,15 @@ + ln -sfn ../run/lock $ROOT/var/lock +fi + -+if [ $WAR_RO -eq 1 ];then ++if [ $WAS_RO -eq 1 ];then + mount $ROOT -o remount,ro +fi -diff --git a/modules.d/30convertfs/do-convertfs.sh b/modules.d/30convertfs/do-convertfs.sh -index 99738e3..ef05a06 100755 ---- a/modules.d/30convertfs/do-convertfs.sh -+++ b/modules.d/30convertfs/do-convertfs.sh -@@ -2,10 +2,27 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh +Index: dracut-041/modules.d/30convertfs/do-convertfs.sh +=================================================================== +--- dracut-041.orig/modules.d/30convertfs/do-convertfs.sh 2015-03-17 17:31:01.441312547 +0100 ++++ dracut-041/modules.d/30convertfs/do-convertfs.sh 2015-03-17 17:37:15.786237620 +0100 +@@ -1,9 +1,26 @@ + #!/bin/bash +# This converts all, /usr/bin -> /bin, ... and /var/run -> /run +# Do not enable by default! @@ -131,11 +129,11 @@ + exit 0 fi fi -diff --git a/modules.d/30convertfs/module-setup.sh b/modules.d/30convertfs/module-setup.sh -index 1e73455..5fead45 100755 ---- a/modules.d/30convertfs/module-setup.sh -+++ b/modules.d/30convertfs/module-setup.sh -@@ -4,8 +4,13 @@ +Index: dracut-041/modules.d/30convertfs/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/30convertfs/module-setup.sh 2015-03-17 17:31:01.445312770 +0100 ++++ dracut-041/modules.d/30convertfs/module-setup.sh 2015-03-17 17:37:15.786237620 +0100 +@@ -2,8 +2,13 @@ # called by dracut check() { @@ -151,13 +149,10 @@ } # called by dracut -@@ -18,5 +23,6 @@ install() { +@@ -16,5 +21,6 @@ inst_multiple bash find ldconfig mv rm cp ln inst_hook pre-pivot 99 "$moddir/do-convertfs.sh" inst_script "$moddir/convertfs.sh" /usr/bin/convertfs + inst_script "$moddir/convertrunfs.sh" /usr/bin/convertrunfs } --- -1.8.4.5 - ++++++ 0107-Fixup-typo-firmare-instead-of-firmware.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -9,11 +9,11 @@ modules.d/95zfcp_rules/parse-zfcp.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh -index 7b6a3d2..bafd053 100755 ---- a/modules.d/95dasd_rules/parse-dasd.sh -+++ b/modules.d/95dasd_rules/parse-dasd.sh -@@ -45,7 +45,7 @@ EOF +Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:15:19.484221789 +0100 ++++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:15:36.577181837 +0100 +@@ -43,7 +43,7 @@ } if [[ -f /sys/firmware/ipl/ipl_type && @@ -22,11 +22,11 @@ ( local _ccw=$(cat /sys/firmware/ipl/device) -diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh -index 05c1ed0..00f530f 100755 ---- a/modules.d/95zfcp_rules/parse-zfcp.sh -+++ b/modules.d/95zfcp_rules/parse-zfcp.sh -@@ -42,7 +42,7 @@ EOF +Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-24 15:15:16.804071255 +0100 ++++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-24 15:15:36.577181837 +0100 +@@ -40,7 +40,7 @@ } if [[ -f /sys/firmware/ipl/ipl_type && @@ -35,6 +35,3 @@ ( local _wwpn=$(cat /sys/firmware/ipl/wwpn) local _lun=$(cat /sys/firmware/ipl/lun) --- -1.8.4.5 - ++++++ 0109-95dasd_rules-Store-all-devices-in-commandline.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/95dasd_rules/module-setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/modules.d/95dasd_rules/module-setup.sh b/modules.d/95dasd_rules/module-setup.sh -index e4736a2..78a7a66 100755 ---- a/modules.d/95dasd_rules/module-setup.sh -+++ b/modules.d/95dasd_rules/module-setup.sh -@@ -14,8 +14,8 @@ cmdline() { +Index: dracut-041/modules.d/95dasd_rules/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/module-setup.sh 2015-03-24 15:14:26.249231803 +0100 ++++ dracut-041/modules.d/95dasd_rules/module-setup.sh 2015-03-24 15:15:39.977372818 +0100 +@@ -12,8 +12,8 @@ return 0 } [[ $hostonly ]] || [[ $mount_needs ]] && { @@ -28,6 +28,3 @@ } # called by dracut --- -1.8.4.5 - ++++++ 0110-95zfcp_rules-Store-all-devices-in-commandline.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/95zfcp_rules/module-setup.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh -index 3f80754..df13fa1 100755 ---- a/modules.d/95zfcp_rules/module-setup.sh -+++ b/modules.d/95zfcp_rules/module-setup.sh -@@ -16,11 +16,11 @@ cmdline() { +Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh 2015-03-24 15:15:15.552000930 +0100 ++++ dracut-041/modules.d/95zfcp_rules/module-setup.sh 2015-03-24 15:15:43.249556607 +0100 +@@ -14,11 +14,11 @@ _wwpn=$(cat ${_sdev}/wwpn) _ccw=$(cat ${_sdev}/hba_id) echo "rd.zfcp=${_ccw},${_wwpn},${_lun}" @@ -32,7 +32,7 @@ } # called by dracut -@@ -31,6 +31,7 @@ check() { +@@ -29,6 +29,7 @@ require_binaries /usr/lib/udev/collect || return 1 [[ $hostonly ]] || [[ $mount_needs ]] && { @@ -40,6 +40,3 @@ for _ccw in /sys/bus/ccw/devices/*/host* ; do [ -d "$_ccw" ] || continue found=$(($found+1)); --- -1.8.4.5 - ++++++ 0117-95dasd_rules-Enable-the-device-before-checking-devic.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -12,11 +12,11 @@ modules.d/95dasd_rules/parse-dasd.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -diff --git a/modules.d/95dasd_rules/parse-dasd.sh b/modules.d/95dasd_rules/parse-dasd.sh -index bafd053..0c297e5 100755 ---- a/modules.d/95dasd_rules/parse-dasd.sh -+++ b/modules.d/95dasd_rules/parse-dasd.sh -@@ -7,6 +7,10 @@ create_udev_rule() { +Index: dracut-041/modules.d/95dasd_rules/parse-dasd.sh +=================================================================== +--- dracut-041.orig/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:15:36.577181837 +0100 ++++ dracut-041/modules.d/95dasd_rules/parse-dasd.sh 2015-03-24 15:15:50.865984400 +0100 +@@ -5,6 +5,10 @@ local _drv _cu_type _dev_type local _rule=/etc/udev/rules.d/51-dasd-${ccw}.rules @@ -27,7 +27,7 @@ if [ -e /sys/bus/ccw/devices/${ccw} ] ; then read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype read _dev_type < /sys/bus/ccw/devices/${ccw}/devtype -@@ -31,10 +35,6 @@ create_udev_rule() { +@@ -29,10 +33,6 @@ esac [ -z "${_drv}" ] && return 0 @@ -38,17 +38,3 @@ [ -e ${_rule} ] && return 0 cat > $_rule <<EOF -@@ -72,8 +72,10 @@ done - - for dasd_arg in $(getargs rd.dasd=); do - ( -+ local OLDIFS="$IFS" - local IFS="," - set -- $dasd_arg -+ IFS="$OLDIFS" - while (($# > 0)); do - case $1 in - autodetect|probeonly) --- -1.8.4.5 - ++++++ 0118-95zfcp_rules-Enable-the-device-before-checking-devic.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -12,11 +12,11 @@ modules.d/95zfcp_rules/parse-zfcp.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -diff --git a/modules.d/95zfcp_rules/parse-zfcp.sh b/modules.d/95zfcp_rules/parse-zfcp.sh -index 00f530f..8db3d9a 100755 ---- a/modules.d/95zfcp_rules/parse-zfcp.sh -+++ b/modules.d/95zfcp_rules/parse-zfcp.sh -@@ -9,6 +9,10 @@ create_udev_rule() { +Index: dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 17:40:04.923688032 +0100 ++++ dracut-041/modules.d/95zfcp_rules/parse-zfcp.sh 2015-03-17 17:40:05.135699878 +0100 +@@ -7,6 +7,10 @@ local _rule=/etc/udev/rules.d/51-zfcp-${ccw}.rules local _cu_type _dev_type @@ -27,7 +27,7 @@ if [ -e /sys/bus/ccw/devices/${ccw} ] ; then read _cu_type < /sys/bus/ccw/devices/${ccw}/cutype read _dev_type < /sys/bus/ccw/devices/${ccw}/devtype -@@ -20,10 +24,6 @@ create_udev_rule() { +@@ -18,10 +22,6 @@ return 0; fi @@ -38,17 +38,3 @@ [ -e ${_rule} ] && return 0 if [ ! -f "$_rule" ] ; then -@@ -54,8 +54,10 @@ fi - - for zfcp_arg in $(getargs rd.zfcp); do - ( -+ local OLDIFS="$IFS" - local IFS="," - set $zfcp_arg -+ IFS="$OLDIFS" - create_udev_rule $1 $2 $3 - ) - done --- -1.8.4.5 - ++++++ 0119-Reset-IFS-variable.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -14,26 +14,11 @@ modules.d/95zfcp/parse-zfcp.sh | 2 ++ 3 files changed, 6 insertions(+) -diff --git a/modules.d/95dasd/parse-dasd.sh b/modules.d/95dasd/parse-dasd.sh -index aba720b..e0d4a9c 100755 ---- a/modules.d/95dasd/parse-dasd.sh -+++ b/modules.d/95dasd/parse-dasd.sh -@@ -3,8 +3,10 @@ - # ex: ts=8 sw=4 sts=4 et filetype=sh - for dasd_arg in $(getargs rd.dasd= -d rd_DASD= DASD=); do - ( -+ local OLDIFS="$IFS" - local IFS="," - set -- $dasd_arg -+ IFS="$OLDIFS" - echo "$@" | normalize_dasd_arg >> /etc/dasd.conf - ) - done -diff --git a/modules.d/95fcoe/parse-fcoe.sh b/modules.d/95fcoe/parse-fcoe.sh -index 8e08303..4ee13cb 100755 ---- a/modules.d/95fcoe/parse-fcoe.sh -+++ b/modules.d/95fcoe/parse-fcoe.sh -@@ -28,8 +28,10 @@ modprobe bnx2fc >/dev/null 2>&1 +Index: dracut-041/modules.d/95fcoe/parse-fcoe.sh +=================================================================== +--- dracut-041.orig/modules.d/95fcoe/parse-fcoe.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/95fcoe/parse-fcoe.sh 2015-03-24 15:15:55.474243227 +0100 +@@ -26,8 +26,10 @@ udevadm settle --timeout=30 parse_fcoe_opts() { @@ -44,21 +29,3 @@ case $# in 2) -diff --git a/modules.d/95zfcp/parse-zfcp.sh b/modules.d/95zfcp/parse-zfcp.sh -index 1d21472..df29fb2 100755 ---- a/modules.d/95zfcp/parse-zfcp.sh -+++ b/modules.d/95zfcp/parse-zfcp.sh -@@ -6,8 +6,10 @@ getargbool 1 rd.zfcp.conf -d -n rd_NO_ZFCPCONF || rm /etc/zfcp.conf - - for zfcp_arg in $(getargs rd.zfcp -d 'rd_ZFCP='); do - ( -+ local OLDIFS="$IFS" - local IFS="," - set $zfcp_arg -+ IFS="$OLDIFS" - echo "$@" >> /etc/zfcp.conf - ) - done --- -1.8.4.5 - ++++++ 0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -10,11 +10,11 @@ mkinitrd-suse.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -diff --git a/mkinitrd-suse.sh b/mkinitrd-suse.sh -index bf10a9d..5b32e6c 100755 ---- a/mkinitrd-suse.sh -+++ b/mkinitrd-suse.sh -@@ -282,7 +282,8 @@ done +Index: dracut-041/mkinitrd-suse.sh +=================================================================== +--- dracut-041.orig/mkinitrd-suse.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/mkinitrd-suse.sh 2015-03-17 17:42:12.198799273 +0100 +@@ -280,7 +280,8 @@ [[ $targets && $kernels ]] || default_kernel_images if [[ ! $targets || ! $kernels ]];then @@ -24,7 +24,7 @@ fi # We can have several targets/kernels, transform the list to an array -@@ -303,6 +304,8 @@ fi +@@ -301,6 +302,8 @@ [[ $domu_module_list ]] || domu_module_list="${DOMU_INITRD_MODULES}" shopt -s extglob @@ -33,7 +33,7 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); do if [[ $img_vers ]];then -@@ -331,14 +334,18 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); do +@@ -329,14 +332,18 @@ # expansion magics if [ -n "${modules_all}" ];then $dracut_cmd $dracut_args --force-drivers "${modules_all}" "$target" "$kernel" &>/dev/null @@ -52,9 +52,9 @@ fi fi done -@@ -348,4 +355,12 @@ if [ "$skip_update_bootloader" ] ; then +@@ -345,4 +352,12 @@ + echo 2>&1 "Did not refresh the bootloader. You might need to refresh it manually." else - echo "Update bootloader..." update-bootloader --refresh + [ $? -ne 0 ] && echo "Updating bootloader failed" && exit 1 +fi @@ -65,6 +65,3 @@ fi + +exit 0 --- -1.8.4.5 - ++++++ 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -13,11 +13,11 @@ lsinitrd.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/dracut.sh b/dracut.sh -index a166cb6..2d8be59 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -627,7 +627,7 @@ if ! [[ $outfile ]]; then +Index: dracut-041/dracut.sh +=================================================================== +--- dracut-041.orig/dracut.sh 2015-03-24 15:12:43.427456873 +0100 ++++ dracut-041/dracut.sh 2015-03-24 15:16:01.578586094 +0100 +@@ -646,7 +646,7 @@ if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then outfile="/boot/${MACHINE_ID}/$kernel/initrd" else @@ -26,11 +26,11 @@ fi fi -diff --git a/lsinitrd.sh b/lsinitrd.sh -index a697bc2..b66a653 100755 ---- a/lsinitrd.sh -+++ b/lsinitrd.sh -@@ -87,7 +87,7 @@ else +Index: dracut-041/lsinitrd.sh +=================================================================== +--- dracut-041.orig/lsinitrd.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/lsinitrd.sh 2015-03-24 15:16:01.578586094 +0100 +@@ -89,7 +89,7 @@ && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" else @@ -39,6 +39,3 @@ fi fi --- -1.8.4.5 - ++++++ 0123-95zfcp_rules-fix-typo-in-module_setup.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/95zfcp_rules/module-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/modules.d/95zfcp_rules/module-setup.sh b/modules.d/95zfcp_rules/module-setup.sh -index df13fa1..2e29ee1 100755 ---- a/modules.d/95zfcp_rules/module-setup.sh -+++ b/modules.d/95zfcp_rules/module-setup.sh -@@ -54,7 +54,7 @@ install() { +Index: dracut-041/modules.d/95zfcp_rules/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95zfcp_rules/module-setup.sh 2015-03-24 15:15:43.249556607 +0100 ++++ dracut-041/modules.d/95zfcp_rules/module-setup.sh 2015-03-24 15:16:04.250736181 +0100 +@@ -52,7 +52,7 @@ local _zfcp for _zfcp in $(cmdline) ; do @@ -26,6 +26,3 @@ done fi if [[ $hostonly ]] ; then --- -1.8.4.5 - ++++++ 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -13,11 +13,11 @@ modules.d/40network/net-lib.sh | 48 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index a82f1a8..554f723 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -200,20 +200,51 @@ ibft_to_cmdline() { +Index: dracut-041/modules.d/40network/net-lib.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/net-lib.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/40network/net-lib.sh 2015-03-24 15:16:07.018891661 +0100 +@@ -213,20 +213,51 @@ [ -e /tmp/net.${dev}.has_ibft_config ] && continue @@ -27,12 +27,11 @@ + # Skip interfaces not used for booting + (( $flags & 2 )) || continue [ -e ${iface}/dhcp ] && dhcp=$(read a < ${iface}/dhcp; echo $a) -- -- if [ -n "$dhcp" ]; then -- echo "ip=$dev:dhcp" + [ -e ${iface}/origin ] && origin=$(read a < ${iface}/origin; echo $a) + [ -e ${iface}/ip-addr ] && ip=$(read a < ${iface}/ip-addr; echo $a) -+ + +- if [ -n "$dhcp" ]; then +- echo "ip=$dev:dhcp" + if [ -n "$ip" ] ; then + case "$ip" in + *.*.*.*) @@ -74,7 +73,7 @@ echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}" else warn "${iface} does not contain a valid iBFT configuration" -@@ -373,6 +404,13 @@ ip_to_var() { +@@ -405,6 +436,13 @@ esac ;; esac @@ -88,6 +87,3 @@ # ip=<ipv4-address> means anaconda-style static config argument cluster: # ip=<ip> gateway=<gw> netmask=<nm> hostname=<host> mtu=<mtu> --- -1.8.4.5 - ++++++ 0125-40network-separate-mask-and-prefix.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -18,11 +18,11 @@ modules.d/40network/parse-ip-opts.sh | 2 +- 3 files changed, 45 insertions(+), 8 deletions(-) -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index f3e07a6..e0bf035 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -223,13 +223,14 @@ do_static() { +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-18 11:57:28.788553583 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-18 11:57:31.032679982 +0100 +@@ -222,13 +222,14 @@ linkup $netif [ -n "$macaddr" ] && ip link set address $macaddr dev $netif [ -n "$mtu" ] && ip link set mtu $mtu dev $netif @@ -38,8 +38,8 @@ + ip addr add $ip/$prefix ${srv:+peer $srv} brd + dev $netif fi - [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw -@@ -404,7 +405,7 @@ for p in $(getargs ip=); do + [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw +@@ -404,7 +405,7 @@ # Pull in existing static configuration . /etc/sysconfig/network/ifcfg-${netif} ip=${IPADDR} @@ -48,7 +48,7 @@ mtu=${MTU} server=${REMOTE_IPADDR} gw=${GATEWAY} -@@ -418,7 +419,7 @@ for p in $(getargs ip=); do +@@ -418,7 +419,7 @@ done # Store config for later use @@ -57,11 +57,11 @@ eval '[ "$'$i'" ] && echo '$i'="$'$i'"' done > /tmp/net.$netif.override -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index 554f723..a3b5030 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -9,6 +9,35 @@ get_ip() { +Index: dracut-041/modules.d/40network/net-lib.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/net-lib.sh 2015-03-18 11:57:28.792553808 +0100 ++++ dracut-041/modules.d/40network/net-lib.sh 2015-03-18 11:57:31.036680206 +0100 +@@ -7,6 +7,35 @@ ip=${ip##* } } @@ -97,7 +97,7 @@ iface_for_remote_addr() { set -- $(ip -o route get to $1) echo $5 -@@ -191,7 +220,7 @@ ibft_to_cmdline() { +@@ -204,7 +233,7 @@ for iface in /sys/firmware/ibft/ethernet*; do local mac="" dev="" local dhcp="" ip="" gw="" mask="" hostname="" @@ -106,7 +106,7 @@ [ -e ${iface}/mac ] || continue mac=$(read a < ${iface}/mac; echo $a) -@@ -236,6 +265,7 @@ ibft_to_cmdline() { +@@ -249,6 +278,7 @@ [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a) if [ "$family" = "ipv6" ] ; then if [ -n "$ip" ] ; then @@ -114,7 +114,7 @@ [ -n "$prefix" ] || prefix=64 ip="[${ip}/${prefix}]" mask= -@@ -243,6 +273,11 @@ ibft_to_cmdline() { +@@ -256,6 +286,11 @@ if [ -n "$gw" ] ; then gw="[${gw}]" fi @@ -126,7 +126,7 @@ fi if [ -n "$ip" ] && [ -n "$mask" -o -n "$prefix" ]; then echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}" -@@ -251,6 +286,7 @@ ibft_to_cmdline() { +@@ -264,6 +299,7 @@ warn "ip-addr=$ip" warn "gateway=$gw" warn "subnet-mask=$mask" @@ -134,7 +134,7 @@ warn "hostname=$hostname" fi else -@@ -379,7 +415,7 @@ ip_to_var() { +@@ -411,7 +447,7 @@ fi done @@ -143,7 +143,7 @@ case $# in 0) autoconf="error" ;; 1) autoconf=$1 ;; -@@ -407,7 +443,7 @@ ip_to_var() { +@@ -439,7 +475,7 @@ # Extract prefix length from CIDR notation case $ip in */*) @@ -152,19 +152,16 @@ ip=${ip%/*} ;; esac -diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index e48b0f3..52a1923 100755 ---- a/modules.d/40network/parse-ip-opts.sh -+++ b/modules.d/40network/parse-ip-opts.sh -@@ -74,7 +74,7 @@ for p in $(getargs ip=); do - none|off) - [ -z "$ip" ] && \ - die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense" -- [ -z "$mask" ] && \ -+ [ -z "$mask" -a -z "$prefix" ] && \ - die "Sorry, automatic calculation of netmask is not yet supported" - ;; - auto6);; --- -1.8.4.5 - +Index: dracut-041/modules.d/40network/parse-ip-opts.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/parse-ip-opts.sh 2015-03-18 11:57:31.044680739 +0100 ++++ dracut-041/modules.d/40network/parse-ip-opts.sh 2015-03-18 11:58:13.727085881 +0100 +@@ -77,7 +77,7 @@ + none|off) + [ -z "$ip" ] && \ + die "For argument 'ip=$p'\nValue '$autoopt' without static configuration does not make sense" +- [ -z "$mask" ] && \ ++ [ -z "$mask" -a -z "$prefix" ] && \ + die "Sorry, automatic calculation of netmask is not yet supported" + ;; + auto6);; ++++++ 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -10,11 +10,11 @@ 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 d6907a3..8437e56 100755 ---- a/modules.d/01fips/module-setup.sh -+++ b/modules.d/01fips/module-setup.sh -@@ -23,7 +23,7 @@ installkernel() { +Index: dracut-041/modules.d/01fips/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/01fips/module-setup.sh 2015-03-24 15:10:53.469281351 +0100 ++++ dracut-041/modules.d/01fips/module-setup.sh 2015-03-24 15:16:11.787159483 +0100 +@@ -21,7 +21,7 @@ _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 " _fipsmodules+="ghash-clmulni-intel " @@ -23,6 +23,3 @@ mkdir -m 0755 -p "${initdir}/etc/modprobe.d" --- -1.8.4.5 - ++++++ 0130-nfs-Always-add-all-kernel-modules-for-kdump.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -10,11 +10,11 @@ modules.d/95nfs/module-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh -index dabf3b0..c126efc 100755 ---- a/modules.d/95nfs/module-setup.sh -+++ b/modules.d/95nfs/module-setup.sh -@@ -28,7 +28,7 @@ depends() { +Index: dracut-041/modules.d/95nfs/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/95nfs/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/95nfs/module-setup.sh 2015-03-18 11:58:44.924843754 +0100 +@@ -25,7 +25,7 @@ # called by dracut installkernel() { @@ -22,7 +22,4 @@ + hostonly='' instmods nfs sunrpc ipv6 nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files lockd rpcsec_gss_krb5 auth_rpcgss } - # called by dracut --- -1.8.4.5 - + cmdline() { ++++++ 0131-40network-handle-prefixed-IP-addresses-correctly.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -14,11 +14,11 @@ modules.d/40network/ifup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index e0bf035..0a485ec 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -224,11 +224,19 @@ do_static() { +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-24 15:16:09.539033210 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-24 15:16:16.595429551 +0100 +@@ -223,11 +223,19 @@ [ -n "$macaddr" ] && ip link set address $macaddr dev $netif [ -n "$mtu" ] && ip link set mtu $mtu dev $netif [ -n "$mask" -a -z "$prefix" ] && prefix=$(mask_to_prefix $mask) @@ -38,6 +38,3 @@ ip addr flush dev $netif ip addr add $ip/$prefix ${srv:+peer $srv} brd + dev $netif fi --- -1.8.4.5 - ++++++ 0132-40network-fixup-static-network-configuration.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -18,16 +18,16 @@ modules.d/40network/net-lib.sh | 6 +++++- 3 files changed, 20 insertions(+), 1 deletion(-) -diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh -index 0a485ec..84dc530 100755 ---- a/modules.d/40network/ifup.sh -+++ b/modules.d/40network/ifup.sh -@@ -242,6 +242,19 @@ do_static() { +Index: dracut-041/modules.d/40network/ifup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/ifup.sh 2015-03-18 12:03:26.848727065 +0100 ++++ dracut-041/modules.d/40network/ifup.sh 2015-03-18 12:04:02.246720640 +0100 +@@ -241,6 +241,19 @@ fi - [ -n "$gw" ] && echo ip route add default via $gw dev $netif > /tmp/net.$netif.gw + [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw + -+ for ifroute in /etc/sysconfig/network/ifroute-${netif} /etc/sysconfig/network/routes ; do ++ for ifroute in /etc/sysconfig/network/ifroute-${netif} /etc/sysconfig/netwrk/routes ; do + [ -e ${ifroute} ] || continue + # Pull in existing routing configuration + read ifr_dest ifr_gw ifr_mask ifr_if < ${ifroute} @@ -42,11 +42,11 @@ [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname return 0 -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 690ff08..9194b1a 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -103,6 +103,8 @@ install() { +Index: dracut-041/modules.d/40network/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/module-setup.sh 2015-03-18 12:03:21.864446201 +0100 ++++ dracut-041/modules.d/40network/module-setup.sh 2015-03-18 12:03:26.856727409 +0100 +@@ -101,6 +101,8 @@ [[ $hostonly ]] && { inst_multiple /etc/sysconfig/network/ifcfg-* @@ -55,11 +55,11 @@ } inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \ -diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh -index a3b5030..fce845a 100755 ---- a/modules.d/40network/net-lib.sh -+++ b/modules.d/40network/net-lib.sh -@@ -124,7 +124,6 @@ setup_net() { +Index: dracut-041/modules.d/40network/net-lib.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/net-lib.sh 2015-03-18 12:03:21.872446652 +0100 ++++ dracut-041/modules.d/40network/net-lib.sh 2015-03-18 12:03:26.860727590 +0100 +@@ -123,7 +123,6 @@ [ -e "/tmp/net.ifaces" ] && read IFACES < /tmp/net.ifaces [ -z "$IFACES" ] && IFACES="$netif" # run the scripts written by ifup @@ -67,7 +67,7 @@ [ -e /tmp/net.$netif.hostname ] && . /tmp/net.$netif.hostname [ -e /tmp/net.$netif.override ] && . /tmp/net.$netif.override [ -e /tmp/dhclient.$netif.dhcpopts ] && . /tmp/dhclient.$netif.dhcpopts -@@ -137,6 +136,11 @@ setup_net() { +@@ -150,6 +149,11 @@ # Note: This assumes that if no router is present the # root server is on the same subnet. @@ -79,6 +79,3 @@ # Get DHCP-provided router IP, or the cmdline-provided "gw=" argument [ -n "$new_routers" ] && gw_ip=${new_routers%%,*} [ -n "$gw" ] && gw_ip=$gw --- -1.8.4.5 - ++++++ 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -10,11 +10,11 @@ modules.d/01fips/module-setup.sh | 13 +++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) -diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh -index 07bd1da..19a2d8e 100755 ---- a/modules.d/01fips/fips.sh -+++ b/modules.d/01fips/fips.sh -@@ -61,9 +61,7 @@ do_rhevh_check() +Index: dracut-041/modules.d/01fips/fips.sh +=================================================================== +--- dracut-041.orig/modules.d/01fips/fips.sh 2015-03-18 13:56:05.453753422 +0100 ++++ dracut-041/modules.d/01fips/fips.sh 2015-03-18 13:59:59.386939913 +0100 +@@ -59,9 +59,7 @@ kpath=${1} # If we're on RHEV-H, the kernel is in /run/initramfs/live/vmlinuz0 @@ -25,7 +25,7 @@ warn "HMAC sum mismatch" return 1 fi -@@ -128,7 +126,7 @@ do_fips() +@@ -126,7 +124,7 @@ elif [ -e "/run/initramfs/live/isolinux/vmlinuz0" ]; then do_rhevh_check /run/initramfs/live/isolinux/vmlinuz0 || return 1 else @@ -34,11 +34,11 @@ fi info "All initrd crypto checks done" -diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh -index 8437e56..009b2ca 100755 ---- a/modules.d/01fips/module-setup.sh -+++ b/modules.d/01fips/module-setup.sh -@@ -23,7 +23,7 @@ installkernel() { +Index: dracut-041/modules.d/01fips/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/01fips/module-setup.sh 2015-03-18 13:56:05.457753647 +0100 ++++ dracut-041/modules.d/01fips/module-setup.sh 2015-03-18 14:10:06.717187740 +0100 +@@ -21,7 +21,7 @@ _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 " _fipsmodules+="ghash-clmulni-intel " @@ -47,12 +47,12 @@ mkdir -m 0755 -p "${initdir}/etc/modprobe.d" -@@ -42,15 +42,16 @@ install() { +@@ -40,15 +40,16 @@ inst_hook pre-pivot 01 "$moddir/fips-noboot.sh" inst_script "$moddir/fips.sh" /sbin/fips.sh - inst_multiple sha512hmac rmmod insmod mount uname umount fipscheck -+ inst_multiple rmmod insmod mount uname umount fipscheck strace ++ inst_multiple rmmod insmod mount uname umount fipscheck - inst_libdir_file libsoftokn3.so libsoftokn3.so \ - libsoftokn3.chk libfreebl3.so libfreebl3.chk \ @@ -66,9 +66,6 @@ .libcryptsetup.so.4.5.0.hmac .libcryptsetup.so.4.hmac \ .libgcrypt.so.20.hmac \ - .libfipscheck.so.1.hmac .libfipscheck.so.1.1.0.hmac + libfreeblpriv3.so libfreeblpriv3.chk # we do not use prelink at SUSE - #inst_multiple -o prelink --- -1.7.6.1 - ++++++ 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -9,11 +9,11 @@ modules.d/40network/module-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 9194b1a..8d74450 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -103,7 +103,7 @@ install() { +Index: dracut-041/modules.d/40network/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/module-setup.sh 2015-03-24 15:16:22.251747251 +0100 ++++ dracut-041/modules.d/40network/module-setup.sh 2015-03-24 15:17:03.618071127 +0100 +@@ -101,7 +101,7 @@ [[ $hostonly ]] && { inst_multiple /etc/sysconfig/network/ifcfg-* @@ -22,6 +22,3 @@ inst_simple /etc/sysconfig/network/routes } --- -1.8.4.5 - ++++++ 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -17,11 +17,11 @@ modules.d/90crypt/module-setup.sh | 4 ++++ 2 files changed, 13 insertions(+) -diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh -index f48397d..fe72914 100755 ---- a/modules.d/90crypt/crypt-lib.sh -+++ b/modules.d/90crypt/crypt-lib.sh -@@ -7,11 +7,20 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh +Index: dracut-041/modules.d/90crypt/crypt-lib.sh +=================================================================== +--- dracut-041.orig/modules.d/90crypt/crypt-lib.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/90crypt/crypt-lib.sh 2015-03-24 15:17:12.866590774 +0100 +@@ -5,11 +5,20 @@ # check if the crypttab contains an entry for a LUKS UUID crypttab_contains() { local luks="$1" @@ -42,11 +42,11 @@ done < /etc/crypttab fi return 1 -diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh -index e423a95..c79dbb8 100755 ---- a/modules.d/90crypt/module-setup.sh -+++ b/modules.d/90crypt/module-setup.sh -@@ -65,6 +65,7 @@ install() { +Index: dracut-041/modules.d/90crypt/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/90crypt/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/90crypt/module-setup.sh 2015-03-24 15:17:12.866590774 +0100 +@@ -63,6 +63,7 @@ inst_hook cleanup 30 "$moddir/crypt-cleanup.sh" fi @@ -54,7 +54,7 @@ if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then # filter /etc/crypttab for the devices we need while read _mapper _dev _rest; do -@@ -74,6 +75,8 @@ install() { +@@ -72,6 +73,8 @@ [[ $_dev == UUID=* ]] && \ _dev="/dev/disk/by-uuid/${_dev#UUID=}" @@ -63,7 +63,7 @@ for _hdev in "${!host_fs_types[@]}"; do [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then -@@ -85,6 +88,7 @@ install() { +@@ -84,6 +87,7 @@ fi inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh" @@ -71,6 +71,3 @@ inst_multiple -o \ $systemdutildir/system-generators/systemd-cryptsetup-generator \ --- -1.8.4.5 - ++++++ 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -8,11 +8,11 @@ dracut-functions.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/dracut-functions.sh b/dracut-functions.sh -index 22e16ff..208c295 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1623,7 +1623,7 @@ find_kernel_modules_by_path () { +Index: dracut-041/dracut-functions.sh +=================================================================== +--- dracut-041.orig/dracut-functions.sh 2015-03-24 15:12:43.423456648 +0100 ++++ dracut-041/dracut-functions.sh 2015-03-24 15:17:15.610744959 +0100 +@@ -1657,7 +1657,7 @@ _OLDIFS=$IFS IFS=: while read a rest; do @@ -21,6 +21,3 @@ printf "%s\n" "$srcmods/$a" done < "$srcmods/modules.dep" IFS=$_OLDIFS --- -1.7.6.1 - ++++++ 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -10,11 +10,11 @@ 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 +Index: dracut-041/dracut.sh +=================================================================== +--- dracut-041.orig/dracut.sh 2015-03-24 15:16:01.578586094 +0100 ++++ dracut-041/dracut.sh 2015-03-24 15:17:20.507020068 +0100 +@@ -1133,6 +1133,7 @@ "/usr/lib64" \ "/boot" \ "/boot/efi" \ @@ -22,6 +22,3 @@ ; do mp=$(readlink -f "$mp") --- -1.7.6.1 - ++++++ 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -11,29 +11,31 @@ 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() { +Index: dracut-041/dracut-functions.sh +=================================================================== +--- dracut-041.orig/dracut-functions.sh 2015-03-18 15:17:19.164428826 +0100 ++++ dracut-041/dracut-functions.sh 2015-03-18 15:19:21.855346813 +0100 +@@ -1740,8 +1740,14 @@ --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 ++ if [[ $DRACUT_KERNEL_LAZY_HASHDIR ]] \ ++ && [ -n "${_mod%.ko*}" ]; then + echo ${_mod%.ko*} >> "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist" ++ for suse_mod_dep in ${suse_mod_deps["${_mod%.ko*}"]}; 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 +Index: dracut-041/dracut.sh +=================================================================== +--- dracut-041.orig/dracut.sh 2015-03-18 15:11:37.169146866 +0100 ++++ dracut-041/dracut.sh 2015-03-18 15:17:19.172429202 +0100 +@@ -841,6 +841,18 @@ fi fi @@ -52,6 +54,3 @@ # handle compression options. [[ $compress ]] || compress="gzip" case $compress in --- -1.7.6.1 - ++++++ 0159-network-Try-to-load-xennet.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -10,11 +10,11 @@ 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 886866b..6a7e51a 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -70,7 +70,7 @@ installkernel() { +Index: dracut-041/modules.d/40network/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/40network/module-setup.sh 2015-03-24 15:17:03.618071127 +0100 ++++ dracut-041/modules.d/40network/module-setup.sh 2015-03-24 15:17:30.915604891 +0100 +@@ -68,7 +68,7 @@ =drivers/net/phy \ =drivers/net/team \ =drivers/net/ethernet \ @@ -23,6 +23,3 @@ } # called by dracut --- -1.7.6.1 - ++++++ 0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -11,11 +11,11 @@ modules.d/10i18n/module-setup.sh | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh -index a091f89..f7ec0d9 100755 ---- a/modules.d/10i18n/module-setup.sh -+++ b/modules.d/10i18n/module-setup.sh -@@ -221,6 +221,10 @@ install() { +Index: dracut-041/modules.d/10i18n/module-setup.sh +=================================================================== +--- dracut-041.orig/modules.d/10i18n/module-setup.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/10i18n/module-setup.sh 2015-03-24 15:17:34.003778419 +0100 +@@ -219,6 +219,10 @@ print_vars KEYMAP EXT_KEYMAPS UNICODE FONT FONT_MAP FONT_UNIMAP >> ${initdir}${VCONFIG_CONF} fi @@ -26,6 +26,3 @@ return 0 } --- -1.8.4.5 - ++++++ 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -10,11 +10,11 @@ dracut-initramfs-restore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dracut-initramfs-restore.sh b/dracut-initramfs-restore.sh -index 0dd1938..a3b7b1b 100644 ---- a/dracut-initramfs-restore.sh -+++ b/dracut-initramfs-restore.sh -@@ -15,7 +15,7 @@ SKIP="$dracutbasedir/skipcpio" +Index: dracut-041/dracut-initramfs-restore.sh +=================================================================== +--- dracut-041.orig/dracut-initramfs-restore.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/dracut-initramfs-restore.sh 2015-03-24 15:17:38.404025658 +0100 +@@ -17,7 +17,7 @@ if [[ $MACHINE_ID ]] && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then IMG="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" fi @@ -23,6 +23,3 @@ cd /run/initramfs --- -1.8.4.5 - ++++++ 0165-Order-root-fsck-after-pre-mount.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -1,11 +1,11 @@ From: Andrei Borzenkov <[email protected]> Subject: ensure pre-mount (and resume) run before root fsck References: bnc#906592 -Index: dracut-037/modules.d/98systemd/rootfs-generator.sh +Index: dracut-041/modules.d/98systemd/rootfs-generator.sh =================================================================== ---- dracut-037.orig/modules.d/98systemd/rootfs-generator.sh -+++ dracut-037/modules.d/98systemd/rootfs-generator.sh -@@ -66,6 +66,23 @@ generator_mount_rootfs() +--- dracut-041.orig/modules.d/98systemd/rootfs-generator.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/98systemd/rootfs-generator.sh 2015-03-24 15:17:43.364304355 +0100 +@@ -64,6 +64,23 @@ fi } @@ -29,7 +29,7 @@ root=$(getarg root=) case "$root" in block:LABEL=*|LABEL=*) -@@ -94,6 +111,7 @@ esac +@@ -92,6 +109,7 @@ if [ "${root%%:*}" = "block" ]; then generator_wait_for_dev "${root#block:}" "$RDRETRY" ++++++ 0168-remove_plymouth_logo_file.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -1,11 +1,10 @@ -Index: dracut-037/modules.d/50plymouth/plymouth-populate-initrd.sh +Index: dracut-041/modules.d/50plymouth/plymouth-populate-initrd.sh =================================================================== ---- dracut-037.orig/modules.d/50plymouth/plymouth-populate-initrd.sh -+++ dracut-037/modules.d/50plymouth/plymouth-populate-initrd.sh -@@ -1,11 +1,9 @@ +--- dracut-041.orig/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-01-31 12:54:52.000000000 +0100 ++++ dracut-041/modules.d/50plymouth/plymouth-populate-initrd.sh 2015-03-24 15:17:46.828499010 +0100 +@@ -1,10 +1,8 @@ #!/bin/bash - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh + -PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png" PLYMOUTH_THEME=$(plymouth-set-default-theme) ++++++ 0170-enable-logitech-hidpp.patch ++++++ --- /var/tmp/diff_new_pack.HRHDCJ/_old 2015-04-16 14:11:18.000000000 +0200 +++ /var/tmp/diff_new_pack.HRHDCJ/_new 2015-04-16 14:11:18.000000000 +0200 @@ -1,13 +1,15 @@ -Index: dracut-037/modules.d/90kernel-modules/module-setup.sh +Index: dracut-041/modules.d/90kernel-modules/module-setup.sh =================================================================== ---- dracut-037.orig/modules.d/90kernel-modules/module-setup.sh -+++ dracut-037/modules.d/90kernel-modules/module-setup.sh -@@ -45,7 +45,7 @@ installkernel() { +--- dracut-041.orig/modules.d/90kernel-modules/module-setup.sh 2015-03-18 15:28:37.954700132 +0100 ++++ dracut-041/modules.d/90kernel-modules/module-setup.sh 2015-03-18 15:29:06.348300969 +0100 +@@ -43,8 +43,8 @@ instmods yenta_socket scsi_dh_rdac scsi_dh_emc scsi_dh_alua \ atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \ -- hid-logitech-dj hid-microsoft firewire-ohci \ -+ hid-logitech-dj hid-logitech-hidpp hid-microsoft firewire-ohci \ - pcmcia usb_storage nvme hid-hyperv hv-vmbus \ - sdhci_acpi +- hid-logitech-dj hid-microsoft hid-lcpower firewire-ohci \ +- pcmcia hid-hyperv hv-vmbus hyperv-keyboard ++ hid-logitech-dj hid-logitech-hidpp hid-microsoft hid-lcpower \ ++ firewire-ohci pcmcia hid-hyperv hv-vmbus hyperv-keyboard + if [[ "$(uname -p)" == arm* ]]; then + # arm specific modules ++++++ dracut-037.tar.xz -> dracut-041.tar.xz ++++++ ++++ 10731 lines of diff (skipped) ++++++ dracut_v37_to_HEAD.patch -> dracut_v041_to_HEAD.patch ++++++ ++++ 1215 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/dracut/dracut_v37_to_HEAD.patch ++++ and /work/SRC/openSUSE:Factory/.dracut.new/dracut_v041_to_HEAD.patch
