Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2015-12-01 09:17:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-11-12
19:36:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2015-12-01
09:17:02.000000000 +0100
@@ -2 +2,111 @@
-Thu Nov 12 08:52:54 UTC 2015 - fvogt@localhost
+Thu Nov 26 10:22:11 UTC 2015 - fv...@suse.com
+
+- Don't require bind-utils, it conflicts with
+ minimal-base-conflicts
+
+-------------------------------------------------------------------
+Thu Nov 26 08:56:50 UTC 2015 - fv...@suse.com
+
+- Add warning about pkgconfig file to rpmlintrc's ignore list
+- Fix spec file:
+ - Add dracut-catimages manpage to dracut-tools
+ - Fix summary of dracut-tools subpackage
+
+-------------------------------------------------------------------
+Thu Nov 26 08:48:13 UTC 2015 - fv...@suse.com
+
+- Remove 0400-use_fstab_systemd.patch
+- Move dracut-catimages, /boot/dracut and /var/lib/dracut into
+ dracut-tools subpackage
+- Cleanup spec file
+
+-------------------------------------------------------------------
+Thu Nov 26 07:51:48 UTC 2015 - fv...@suse.com
+
+- Refresh patches with line offsets:
+ 0017-45ifcfg-use-distro-specific-scripts.patch
+ 0048-40network-Only-enable-network-interfaces-if-explicit.patch
+ 0088-91zipl-Add-new-module-to-update-s390x-configuration.patch
+ 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch
+ 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch
+ 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch
+ 0182-fix-include-parsing.patch
+ 0183-fix_add_drivers_hang.patch
+ 0203-no-fail-builtin-module.patc
+
+-------------------------------------------------------------------
+Wed Nov 25 15:55:01 UTC 2015 - fv...@suse.com
+
+- Update to dracut-044
+- Patches upstream, removed here:
+ 0119-Reset-IFS-variable.patch
+ 0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch
+ 0122-Get_kernel_version_from_gz_file_for_arm.patch
+ 0165-Order-root-fsck-after-pre-mount.patch
+ 0184-fix_lvm_wc_warning.patch
+ 0185-dracut.sh-remove-_EARLY-from-CONFIG_MICROCODE_-check.patch
+ 0401-mount_option_mountpoint.patch
+
+- Updated/Refreshed patches:
+ 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
+ 0019-40network-Fix-race-condition-when-wait-for-networks.patch
+ 0056-81cio_ignore-handle-cio_ignore-commandline.patch
+ 0058-dracut-add-warning-when-including-unsupported-module.patch
+ 0066-40network-always-start-netroot-in-ifup.sh.patch
+ 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch
+ 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch
+ 0125-40network-separate-mask-and-prefix.patch
+ 0131-40network-handle-prefixed-IP-addresses-correctly.patch
+ 0132-40network-fixup-static-network-configuration.patch
+ 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch
+ 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch
+ 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch
+ 0159-network-Try-to-load-xennet.patch
+ 0202-dracut_dmraid_use_udev.patch
+ 0203-no-fail-builtin-module.patch
+ 0402-driver-fail-summary.patch
+
+-------------------------------------------------------------------
+Wed Nov 25 08:06:02 UTC 2015 - fv...@suse.com
+
+- Fix 0202-dracut_dmraid_use_udev.patch:
+ - Statement was missing a program to execute
+
+-------------------------------------------------------------------
+Tue Nov 24 13:38:45 UTC 2015 - fv...@suse.com
+
+- Add 0206-nfs_dns_alias.patch to fix boo#955592:
+ - Fix dracut run on nfs root where NFS host is a DNS ALIAS
+- Require bind-utils. host is used in some lines
+
+-------------------------------------------------------------------
+Thu Nov 19 09:18:31 CET 2015 - ti...@suse.de
+
+- Fix the wrong kernel config check for microcode with 4.4 kernel
+ (boo#955712):
+ 0185-dracut.sh-remove-_EARLY-from-CONFIG_MICROCODE_-check.patch
+
+-------------------------------------------------------------------
+Tue Nov 17 14:08:10 UTC 2015 - fv...@suse.com
+
+- Disable 0400-use_fstab_systemd.patch
+ - Fully implementing this would take ages
+ - Fix boo#948771
+
+-------------------------------------------------------------------
+Tue Nov 17 13:14:26 UTC 2015 - fv...@suse.com
+
+- Add numbers to the filename of all patches:
+fips_add_aesni-intel.patch -> 0138-fips_add_aesni-intel.patch
+dracut_fix_multipath_without_config.patch ->
0200-dracut_fix_multipath_without_config.patch
+fix_nfs_with_ip_instead_of_hostname.patch ->
0201-fix_nfs_with_ip_instead_of_hostname.patch
+dracut_dmraid_use_udev.patch -> 0202-dracut_dmraid_use_udev.patch
+dracut_dont_use_dpkg_defaults_on_SUSE.patch ->
0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch
+
+-------------------------------------------------------------------
+Mon Nov 16 10:09:03 UTC 2015 - fv...@suse.com
+
+- Update description in dracut.spec
+
+-------------------------------------------------------------------
+Thu Nov 12 08:52:54 UTC 2015 - fv...@suse.com
Old:
----
0119-Reset-IFS-variable.patch
0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch
0122-Get_kernel_version_from_gz_file_for_arm.patch
0165-Order-root-fsck-after-pre-mount.patch
0184-fix_lvm_wc_warning.patch
0400-use_fstab_systemd.patch
0401-mount_option_mountpoint.patch
dracut-043.tar.xz
dracut_dmraid_use_udev.patch
dracut_dont_use_dpkg_defaults_on_SUSE.patch
dracut_fix_multipath_without_config.patch
fips_add_aesni-intel.patch
fix_nfs_with_ip_instead_of_hostname.patch
New:
----
0138-fips_add_aesni-intel.patch
0200-dracut_fix_multipath_without_config.patch
0201-fix_nfs_with_ip_instead_of_hostname.patch
0202-dracut_dmraid_use_udev.patch
0206-nfs_dns_alias.patch
0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch
dracut-044.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -19,7 +19,7 @@
%define dracutlibdir %{_libexecdir}/dracut
Name: dracut
-Version: 043
+Version: 044
Release: 0
Summary: Initramfs generator using udev
License: GPL-2.0+ and LGPL-2.1+
@@ -32,11 +32,9 @@
Source5: purge-kernels.service
Source6: dracut-installkernel
-# Sent mainline
+#Network:
Patch12: 0019-40network-Fix-race-condition-when-wait-for-networks.patch
Patch13: 0066-40network-always-start-netroot-in-ifup.sh.patch
-
-#Network:
Patch15: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch
Patch17: 0017-45ifcfg-use-distro-specific-scripts.patch
Patch48: 0048-40network-Only-enable-network-interfaces-if-explicit.patch
@@ -82,7 +80,7 @@
Patch57: 0057-01fips-Include-some-more-hmacs.patch
Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch
Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch
-Patch138: fips_add_aesni-intel.patch
+Patch138: 0138-fips_add_aesni-intel.patch
# Others
Patch20: 0020-00warpclock-Set-correct-timezone.patch
@@ -90,23 +88,18 @@
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
-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-Get_kernel_version_from_gz_file_for_arm.patch
Patch130: 0130-nfs-Always-add-all-kernel-modules-for-kdump.patch
Patch144: 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch
Patch150: 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch
Patch158: 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..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
Patch168: 0168-remove_plymouth_logo_file.patch
Patch180: 0180-i18n_add_correct_fontmaps.patch
Patch181: 0181-no_systemd_cryptsetup.patch
Patch182: 0182-fix-include-parsing.patch
Patch183: 0183-fix_add_drivers_hang.patch
-Patch184: 0184-fix_lvm_wc_warning.patch
# Still needed
Patch133: 0133-Allow-multiple-configurations-per-network-interface-.patch
@@ -116,20 +109,19 @@
# Submit mainline asap
Patch128: 0128-90lvm-Install-dm-snapshot-module.patch
-Patch200: dracut_fix_multipath_without_config.patch
-Patch201: fix_nfs_with_ip_instead_of_hostname.patch
-Patch202: dracut_dmraid_use_udev.patch
+Patch200: 0200-dracut_fix_multipath_without_config.patch
+Patch201: 0201-fix_nfs_with_ip_instead_of_hostname.patch
+Patch202: 0202-dracut_dmraid_use_udev.patch
Patch203: 0203-no-fail-builtin-module.patch
Patch204: 0204-mkinitrd-fix-monster.patch
Patch205: 0205-mdraid_ignore_hostonly.patch
+Patch206: 0206-nfs_dns_alias.patch
-## fix for SUSE systems which have dpkg installed anyway
-Patch300: dracut_dont_use_dpkg_defaults_on_SUSE.patch
+## SUSE-specific fixes
+Patch300: 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch
Patch301: 0301-include_sysconfig_language.patch
# New features/improvements
-Patch400: 0400-use_fstab_systemd.patch
-Patch401: 0401-mount_option_mountpoint.patch
Patch402: 0402-driver-fail-summary.patch
BuildRequires: asciidoc
@@ -137,9 +129,11 @@
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libxslt
BuildRequires: suse-module-tools
-BuildRequires: pkgconfig(systemd) >= 199
-Requires: /usr/bin/get_kernel_version
+BuildRequires: pkgconfig(systemd) >= 219
+Requires: %{_bindir}/get_kernel_version
Requires: bash
+# systemd-sysvinit provides: poweroff, reboot, halt
+Requires: binutils
Requires: coreutils
Requires: cpio
Requires: file
@@ -150,9 +144,7 @@
Requires: modutils
Requires: pigz
Requires: sed
-Requires: systemd >= 200
-# systemd-sysvinit provides: poweroff, reboot, halt
-Requires: binutils
+Requires: systemd >= 219
Requires: systemd-sysvinit
Requires: udev > 166
Requires: util-linux >= 2.21
@@ -164,11 +156,10 @@
%{?systemd_requires}
%description
-Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels.
-Unlike existing implementations, dracut does hard-code as little as possible
-into the initramfs. Dracut contains various modules which are driven by the
-event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as
-NFS, iSCSI, NBD, FCoE with the dracut-network package.
+Dracut contains tools to create a bootable initramfs for Linux kernels >= 2.6.
+Dracut contains various modules which are driven by the event-based udev
+and systemd. Having root on MD, DM, LVM2, LUKS is supported as well as
+NFS, iSCSI, NBD, FCoE.
%package fips
Summary: Dracut modules to build a dracut initramfs with an integrity
check
@@ -183,6 +174,14 @@
initramfs with dracut, which does an integrity check of the kernel
and its cryptography during startup.
+%package tools
+Summary: Tools to build a local initramfs
+Group: System/Base
+Requires: %{name} = %{version}-%{release}
+
+%description tools
+This package contains tools to assemble the local initrd and host
configuration.
+
%prep
%setup -q
%patch12 -p1
@@ -226,10 +225,7 @@
%patch116 -p1
%patch117 -p1
%patch118 -p1
-%patch119 -p1
-%patch120 -p1
%patch121 -p1
-%patch122 -p1
%patch123 -p1
%patch124 -p1
%patch125 -p1
@@ -256,14 +252,12 @@
%patch159 -p1
%patch163 -p1
%patch164 -p1
-%patch165 -p1
%patch168 -p1
%patch180 -p1
# disabled, as it breaks encrypted / on LVM - dimstar, 20151001
#patch181 -p1
%patch182 -p1
%patch183 -p1
-%patch184 -p1
%patch200 -p1
%patch201 -p1
@@ -271,12 +265,11 @@
%patch203 -p1
%patch204 -p1
%patch205 -p1
+%patch206 -p1
%patch300 -p1
%patch301 -p1
-%patch400 -p1
-%patch401 -p1
%patch402 -p1
%build
@@ -291,31 +284,33 @@
echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" >
%{buildroot}/%{dracutlibdir}/dracut-version.sh
-# we do not support dash in the initramfs
-rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash
-rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox
+# use 00systemd-bootchart instead
rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00bootchart
-# remove gentoo specific modules
-rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash
+# not supported
+rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash
+rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox
-# IMA modules are not supported currently.
+# with systemd IMA and selinux modules do not make sense
rm -fr %{buildroot}/%{dracutlibdir}/modules.d/96securityfs
rm -fr %{buildroot}/%{dracutlibdir}/modules.d/97masterkey
rm -fr %{buildroot}/%{dracutlibdir}/modules.d/98integrity
+# remove gentoo specific modules
+rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash
+
mkdir -p %{buildroot}/boot/dracut
mkdir -p %{buildroot}%{_localstatedir}/lib/dracut/overlay
mkdir -p %{buildroot}%{_localstatedir}/log
touch %{buildroot}%{_localstatedir}/log/dracut.log
install -m 0644 dracut.conf.d/suse.conf.example
%{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf
-
install -m 0644 dracut.conf.d/fips.conf.example
%{buildroot}%{_sysconfdir}/dracut.conf.d/40-fips.conf
%ifarch %ix86 x86_64
echo 'early_microcode="yes"' >
%{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf
%endif
+
rm %{buildroot}%{_bindir}/mkinitrd
# moved to /sbin
mkdir -p %{buildroot}/sbin
@@ -372,35 +367,34 @@
%{dracutlibdir}/modules.d/01fips
%{dracutlibdir}/modules.d/02fips-aesni
+%files tools
+%{_bindir}/dracut-catimages
+%{_mandir}/man8/dracut-catimages.8*
+%dir /boot/dracut
+%dir %{_localstatedir}/lib/dracut
+%dir %{_localstatedir}/lib/dracut/overlay
+
%files
%defattr(-,root,root,0755)
%doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg
%{_bindir}/dracut
-%{_bindir}/dracut-catimages
%{_bindir}/lsinitrd
/sbin/purge-kernels
/sbin/installkernel
/sbin/mkinitrd
/sbin/mkinitrd_setup
%config %{_sysconfdir}/bash_completion.d/lsinitrd
-/usr/share/pkgconfig/dracut.pc
-%dir %{dracutlibdir}
-%dir %{dracutlibdir}/modules.d
-%{dracutlibdir}/skipcpio
-%{dracutlibdir}/dracut-functions.sh
-%{dracutlibdir}/dracut-functions
-%{dracutlibdir}/dracut-version.sh
-%{dracutlibdir}/dracut-logger.sh
-%{dracutlibdir}/dracut-initramfs-restore
-%{dracutlibdir}/dracut-install
+%{_datadir}/pkgconfig/dracut.pc
+
%config(noreplace) %{_sysconfdir}/dracut.conf
+%dir %{_sysconfdir}/dracut.conf.d
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
%config %{_sysconfdir}/dracut.conf.d/01-dist.conf
%endif
%ifarch %ix86 x86_64
%config %{_sysconfdir}/dracut.conf.d/02-early-microcode.conf
%endif
-%dir %{_sysconfdir}/dracut.conf.d
+
%{_mandir}/man8/dracut.8*
%{_mandir}/man8/mkinitrd.8*
%{_mandir}/man1/lsinitrd.1*
@@ -417,21 +411,31 @@
%{_mandir}/man8/dracut-pre-mount.service.8.*
%{_mandir}/man8/dracut-shutdown.service.8.*
%{_mandir}/man5/dracut.conf.5*
-%{_mandir}/man8/dracut-catimages.8*
+
%dir %{_libexecdir}/kernel
%dir %{_libexecdir}/kernel/install.d
%{_libexecdir}/kernel/install.d/50-dracut.install
%{_libexecdir}/kernel/install.d/51-dracut-rescue.install
-%dir %{dracutlibdir}/modules.d/00systemd-bootchart
-%dir %{dracutlibdir}/modules.d/03rescue
+
+%dir %{dracutlibdir}
+%{dracutlibdir}/skipcpio
+%{dracutlibdir}/dracut-functions.sh
+%{dracutlibdir}/dracut-init.sh
+%{dracutlibdir}/dracut-functions
+%{dracutlibdir}/dracut-version.sh
+%{dracutlibdir}/dracut-logger.sh
+%{dracutlibdir}/dracut-initramfs-restore
+%{dracutlibdir}/dracut-install
+
+%dir %{dracutlibdir}/modules.d
%{dracutlibdir}/modules.d/00bash
-%{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh
+%{dracutlibdir}/modules.d/00systemd-bootchart
%{dracutlibdir}/modules.d/00warpclock
%{dracutlibdir}/modules.d/00systemd
%{dracutlibdir}/modules.d/01systemd-initrd
%{dracutlibdir}/modules.d/02systemd-networkd
%{dracutlibdir}/modules.d/03modsign
-%{dracutlibdir}/modules.d/03rescue/module-setup.sh
+%{dracutlibdir}/modules.d/03rescue
%{dracutlibdir}/modules.d/04watchdog
%{dracutlibdir}/modules.d/10i18n
%{dracutlibdir}/modules.d/30convertfs
@@ -494,21 +498,20 @@
%{dracutlibdir}/modules.d/99uefi-lib
# executable fixups
+%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh
+%attr(0755,root,root) %{dracutlibdir}/modules.d/90livenet/livenet-generator.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/parse-dcssblk.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/module-setup.sh
+%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/cleanup-fcoe.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh
%attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/module-setup.sh
-%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh
%config(noreplace) %{_sysconfdir}/logrotate.d/dracut
-%attr(0644,root,root) %ghost %config(missingok,noreplace)
%{_localstatedir}/log/dracut.log
+%attr(0640,root,root) %ghost %config(missingok,noreplace)
%{_localstatedir}/log/dracut.log
%dir %{_unitdir}/initrd.target.wants
+%dir %{_unitdir}/sysinit.target.wants
%{_unitdir}/*.service
%{_unitdir}/*/*.service
-%dir %{_unitdir}/sysinit.target.wants
%config %{_sysconfdir}/bash_completion.d/dracut
-%dir /boot/dracut
-%dir %{_localstatedir}/lib/dracut
-%dir %{_localstatedir}/lib/dracut/overlay
%changelog
++++++ 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -20,19 +20,19 @@
delete mode 100644 modules.d/40network/dhclient.conf
delete mode 100755 modules.d/40network/kill-dhclient.sh
-Index: dracut-042/modules.d/40network/dhclient.conf
+Index: dracut-044/modules.d/40network/dhclient.conf
===================================================================
---- dracut-042.orig/modules.d/40network/dhclient.conf 2015-06-11
17:39:47.000000000 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- dracut-044.orig/modules.d/40network/dhclient.conf
++++ /dev/null
@@ -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;
-Index: dracut-042/modules.d/40network/ifup.sh
+Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24
18:02:05.645160455 +0200
-+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:05.945177534
+0200
-@@ -86,21 +86,106 @@ else
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -87,6 +87,70 @@ else
[ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] &&
exit 0
fi
@@ -103,8 +103,9 @@
# Run dhclient
do_dhcp() {
# dhclient-script will mark the netif up and generate the online
- # event for nfsroot
- # XXX add -V vendor class and option parsing per kernel
+@@ -98,28 +162,35 @@ do_dhcp() {
+ local _DHCPRETRY=$(getargs rd.net.dhcp.retry=)
+ _DHCPRETRY=${_DHCPRETRY:-1}
- [ -e /tmp/dhclient.$netif.pid ] && return 0
+ [ -f /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} ] && return 0
@@ -122,7 +123,7 @@
+ ip $1 addr flush dev "$netif"
if ! iface_has_link $netif; then
-- echo "No carrier detected"
+- warn "No carrier detected on interface $netif"
- return 1
+ warn "No carrier detected"
+ warn "Trying to set $netif up..."
@@ -132,10 +133,22 @@
+ return 1
+ fi
fi
-+
- echo "Starting dhcp for interface $netif"
-- dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid
-lf /tmp/dhclient.$netif.lease $netif \
-- || echo "dhcp failed"
+
+- while [ $_COUNT -lt $_DHCPRETRY ]; do
+- info "Starting dhcp for interface $netif"
+- dhclient "$@" \
+- ${_timeout:+-timeout $_timeout} \
+- -q \
+- -cf /etc/dhclient.conf \
+- -pf /tmp/dhclient.$netif.pid \
+- -lf /tmp/dhclient.$netif.lease \
+- $netif \
+- && return 0
+- _COUNT=$(($_COUNT+1))
+- [ $_COUNT -lt $_DHCPRETRY ] && sleep 1
+- done
+- warn "dhcp for interface $netif failed"
+- return 1
+ $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
+ dhcp_apply $1 || return $?
+
@@ -144,7 +157,7 @@
}
load_ipv6() {
-@@ -226,8 +311,6 @@ if [ -e /tmp/team.info ]; then
+@@ -262,8 +333,6 @@ if [ -e /tmp/team.info ]; then
fi
fi
@@ -153,10 +166,10 @@
if [ -e /tmp/bridge.info ]; then
. /tmp/bridge.info
# start bridge if necessary
-Index: dracut-042/modules.d/40network/kill-dhclient.sh
+Index: dracut-044/modules.d/40network/kill-dhclient.sh
===================================================================
---- dracut-042.orig/modules.d/40network/kill-dhclient.sh 2015-06-11
17:39:47.000000000 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+--- dracut-044.orig/modules.d/40network/kill-dhclient.sh
++++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
@@ -173,10 +186,10 @@
- read PID < $f;
- kill -9 $PID >/dev/null 2>&1
-done
-Index: dracut-042/modules.d/40network/module-setup.sh
+Index: dracut-044/modules.d/40network/module-setup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/module-setup.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24
18:02:05.949177762 +0200
+--- dracut-044.orig/modules.d/40network/module-setup.sh
++++ dracut-044/modules.d/40network/module-setup.sh
@@ -1,10 +1,13 @@
#!/bin/bash
++++++ 0017-45ifcfg-use-distro-specific-scripts.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -16,11 +16,11 @@
modules.d/45ifcfg/module-setup.sh | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
-Index: dracut-042/modules.d/40network/ifup.sh
+Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24
18:02:05.945177534 +0200
-+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:06.605215110
+0200
-@@ -184,6 +184,7 @@ do_dhcp() {
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -189,6 +189,7 @@ do_dhcp() {
$dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
dhcp_apply $1 || return $?
@@ -28,10 +28,10 @@
echo $netif > /tmp/setup_net_${netif}.ok
return 0
}
-Index: dracut-042/modules.d/45ifcfg/module-setup.sh
+Index: dracut-044/modules.d/45ifcfg/module-setup.sh
===================================================================
---- dracut-042.orig/modules.d/45ifcfg/module-setup.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/45ifcfg/module-setup.sh 2015-06-24
18:02:06.605215110 +0200
+--- dracut-044.orig/modules.d/45ifcfg/module-setup.sh
++++ dracut-044/modules.d/45ifcfg/module-setup.sh
@@ -2,7 +2,13 @@
# called by dracut
++++++ 0019-40network-Fix-race-condition-when-wait-for-networks.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -17,11 +17,11 @@
modules.d/40network/net-genrules.sh | 3 +++
1 file changed, 3 insertions(+)
-Index: dracut-042/modules.d/40network/net-genrules.sh
+Index: dracut-044/modules.d/40network/net-genrules.sh
===================================================================
---- dracut-042.orig/modules.d/40network/net-genrules.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/40network/net-genrules.sh 2015-06-24
18:02:05.357144086 +0200
-@@ -96,6 +96,9 @@ command -v fix_bootif >/dev/null || . /l
+--- dracut-044.orig/modules.d/40network/net-genrules.sh
++++ dracut-044/modules.d/40network/net-genrules.sh
+@@ -95,6 +95,9 @@ command -v fix_bootif >/dev/null || . /l
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
++++++ 0048-40network-Only-enable-network-interfaces-if-explicit.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -16,11 +16,11 @@
modules.d/40network/net-genrules.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: dracut-042/modules.d/40network/net-genrules.sh
+Index: dracut-044/modules.d/40network/net-genrules.sh
===================================================================
---- dracut-042.orig/modules.d/40network/net-genrules.sh 2015-06-24
18:02:05.357144086 +0200
-+++ dracut-042/modules.d/40network/net-genrules.sh 2015-06-24
18:02:07.521267259 +0200
-@@ -95,8 +95,8 @@ command -v fix_bootif >/dev/null || . /l
+--- dracut-044.orig/modules.d/40network/net-genrules.sh
++++ dracut-044/modules.d/40network/net-genrules.sh
+@@ -94,8 +94,8 @@ command -v fix_bootif >/dev/null || . /l
else
cond='ACTION=="add", SUBSYSTEM=="net"'
# if you change the name of "91-default-net.rules", also change
modules.d/80cms/cmssetup.sh
++++++ 0056-81cio_ignore-handle-cio_ignore-commandline.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -32,12 +32,12 @@
Signed-off-by: Thomas Renninger <tr...@suse.de>
-Index: dracut-042/dracut.cmdline.7.asc
+Index: dracut-044/dracut.cmdline.7.asc
===================================================================
---- dracut-042.orig/dracut.cmdline.7.asc 2015-06-11 17:39:47.000000000
+0200
-+++ dracut-042/dracut.cmdline.7.asc 2015-06-24 18:02:08.125301648 +0200
-@@ -869,6 +869,21 @@ NOTE: There must be enough free RAM avai
- This method is very suitable for diskless boots.
+--- dracut-044.orig/dracut.cmdline.7.asc
++++ dracut-044/dracut.cmdline.7.asc
+@@ -948,6 +948,21 @@ that memory is given back to the kernel
+ anymore.
+CIO_IGNORE
@@ -58,10 +58,10 @@
Plymouth Boot Splash
~~~~~~~~~~~~~~~~~~~~
**plymouth.enable=0**::
-Index: dracut-042/modules.d/81cio_ignore/module-setup.sh
+Index: dracut-044/modules.d/81cio_ignore/module-setup.sh
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dracut-042/modules.d/81cio_ignore/module-setup.sh 2015-06-24
18:02:08.125301648 +0200
+--- /dev/null
++++ dracut-044/modules.d/81cio_ignore/module-setup.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -103,10 +103,10 @@
+ inst_hook cmdline 20 "$moddir/parse-cio_accept.sh"
+ inst_multiple cio_ignore
+}
-Index: dracut-042/modules.d/81cio_ignore/parse-cio_accept.sh
+Index: dracut-044/modules.d/81cio_ignore/parse-cio_accept.sh
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dracut-042/modules.d/81cio_ignore/parse-cio_accept.sh 2015-06-24
18:02:08.125301648 +0200
+--- /dev/null
++++ dracut-044/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; -*-
++++++ 0058-dracut-add-warning-when-including-unsupported-module.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -20,16 +20,16 @@
Signed-off-by: Jeff Mahoney <je...@suse.com>
---
- dracut-functions.sh | 21 +++++++++++++++++++++
+ dracut-init.sh | 21 +++++++++++++++++++++
dracut.8.asc | 11 +++++++++++
dracut.sh | 5 +++++
3 files changed, 37 insertions(+)
-Index: dracut-042/dracut-functions.sh
+Index: dracut-044/dracut-init.sh
===================================================================
---- dracut-042.orig/dracut-functions.sh 2015-06-11 17:39:47.000000000
+0200
-+++ dracut-042/dracut-functions.sh 2015-06-24 18:02:08.741336717 +0200
-@@ -1436,6 +1436,17 @@ for_each_module_dir() {
+--- dracut-044.orig/dracut-init.sh
++++ dracut-044/dracut-init.sh
+@@ -849,6 +849,17 @@ for_each_module_dir() {
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() {
-@@ -1498,6 +1509,10 @@ install_kmod_with_fw() {
+@@ -910,6 +921,10 @@ install_kmod_with_fw() {
fi
fi
done
@@ -58,7 +58,7 @@
return 0
}
-@@ -1544,6 +1559,12 @@ dracut_kernel_post() {
+@@ -956,6 +971,12 @@ dracut_kernel_post() {
inst_simple "$_modpath"
"/lib/modules/$kernel/${_destpath}" || exit $?
done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep"
fi
@@ -71,11 +71,11 @@
) &
_pid=$(jobs -p | while read a || [ -n "$a" ]; do printf ":$a";done)
_pid=${_pid##*:}
-Index: dracut-042/dracut.8.asc
+Index: dracut-044/dracut.8.asc
===================================================================
---- dracut-042.orig/dracut.8.asc 2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/dracut.8.asc 2015-06-24 18:02:08.741336717 +0200
-@@ -479,6 +479,17 @@ will not be able to boot.
+--- dracut-044.orig/dracut.8.asc
++++ dracut-044/dracut.8.asc
+@@ -490,6 +490,17 @@ will not be able to boot.
Specifies the kernel image, which to include in the UEFI executable. The
default is
_/lib/modules/<KERNEL-VERSION>/vmlinuz_ or
_/boot/vmlinuz-<KERNEL-VERSION>_
@@ -93,11 +93,11 @@
FILES
-----
_/var/log/dracut.log_::
-Index: dracut-042/dracut.sh
+Index: dracut-044/dracut.sh
===================================================================
---- dracut-042.orig/dracut.sh 2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/dracut.sh 2015-06-24 18:02:08.745336946 +0200
-@@ -193,6 +193,9 @@ Creates initial ramdisk images for prelo
+--- dracut-044.orig/dracut.sh
++++ dracut-044/dracut.sh
+@@ -203,6 +203,9 @@ Creates initial ramdisk images for prelo
--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)
@@ -105,21 +105,21 @@
+ using a kernel that is configured to check the
+ support status of a module before loading.
--reproducible Create reproducible images
+ --no-reproducible Do not create reproducible images
--loginstall [DIR] Log all files installed from the host to [DIR]
- --uefi Create an UEFI executable with the kernel cmdline and
-@@ -391,6 +394,7 @@ rearrange_params()
+@@ -360,6 +363,7 @@ rearrange_params()
--long noimageifnotneeded \
--long early-microcode \
--long no-early-microcode \
+ --long check-supported \
--long reproducible \
+ --long no-reproducible \
--long loginstall: \
- --long uefi \
-@@ -583,6 +587,7 @@ while :; do
+@@ -556,6 +560,7 @@ while :; do
--printsize) printsize="yes";;
--regenerate-all) regenerate_all="yes";;
--noimageifnotneeded) noimageifnotneeded="yes";;
+ --check-supported) check_supported="yes" ;;
--reproducible) reproducible_l="yes";;
+ --no-reproducible) reproducible_l="no";;
--uefi) uefi="yes";;
- --uefi-stub)
++++++ 0066-40network-always-start-netroot-in-ifup.sh.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100
@@ -16,23 +16,32 @@
modules.d/40network/ifup.sh | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
-Index: dracut-042/modules.d/40network/ifup.sh
+Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:05.645160455
+0200
-@@ -338,21 +338,15 @@ for p in $(getargs ip=); do
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -373,27 +373,20 @@ for p in $(getargs ip=); do
+ do_static ;;
esac
done
+- ret=$?
- > /tmp/net.${netif}.up
+ if [ $? -eq 0 ]; then
+ > /tmp/net.${netif}.up
+- if [ -e /sys/class/net/${netif}/address ]; then
+- > /tmp/net.$(cat /sys/class/net/${netif}/address).up
+- fi
++ if [ -e /sys/class/net/${netif}/address ]; then
++ > /tmp/net.$(cat /sys/class/net/${netif}/address).up
++ fi
+
- case $autoconf in
- dhcp|on|any|dhcp6)
- ;;
- *)
-- if [ $? -eq 0 ]; then
+- if [ $ret -eq 0 ]; then
- setup_net $netif
- source_hook initqueue/online $netif
- if [ -z "$manualup" ]; then
++++++ 0088-91zipl-Add-new-module-to-update-s390x-configuration.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -19,11 +19,11 @@
create mode 100644 modules.d/91zipl/module-setup.sh
create mode 100644 modules.d/91zipl/parse-zipl.sh
-Index: dracut-042/dracut.cmdline.7.asc
+Index: dracut-044/dracut.cmdline.7.asc
===================================================================
---- dracut-042.orig/dracut.cmdline.7.asc 2015-06-24 18:02:08.125301648
+0200
-+++ dracut-042/dracut.cmdline.7.asc 2015-06-24 18:02:12.621557615 +0200
-@@ -884,6 +884,20 @@ CIO_IGNORE
+--- dracut-044.orig/dracut.cmdline.7.asc
++++ dracut-044/dracut.cmdline.7.asc
+@@ -963,6 +963,20 @@ CIO_IGNORE
rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802
--
@@ -44,10 +44,10 @@
Plymouth Boot Splash
~~~~~~~~~~~~~~~~~~~~
**plymouth.enable=0**::
-Index: dracut-042/modules.d/91zipl/install_zipl_cmdline.sh
+Index: dracut-044/modules.d/91zipl/install_zipl_cmdline.sh
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dracut-042/modules.d/91zipl/install_zipl_cmdline.sh 2015-06-24
18:02:12.621557615 +0200
+--- /dev/null
++++ dracut-044/modules.d/91zipl/install_zipl_cmdline.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
@@ -82,10 +82,10 @@
+> /tmp/install.zipl.cmdline-done
+
+exit 0
-Index: dracut-042/modules.d/91zipl/module-setup.sh
+Index: dracut-044/modules.d/91zipl/module-setup.sh
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dracut-042/modules.d/91zipl/module-setup.sh 2015-06-24
18:02:12.621557615 +0200
+--- /dev/null
++++ dracut-044/modules.d/91zipl/module-setup.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -132,10 +132,10 @@
+ fi
+ dracut_need_initqueue
+}
-Index: dracut-042/modules.d/91zipl/parse-zipl.sh
+Index: dracut-044/modules.d/91zipl/parse-zipl.sh
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dracut-042/modules.d/91zipl/parse-zipl.sh 2015-06-24 18:02:12.621557615
+0200
+--- /dev/null
++++ dracut-044/modules.d/91zipl/parse-zipl.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
++++++ 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -15,11 +15,11 @@
modules.d/40network/parse-ip-opts.sh | 8 +++++++-
3 files changed, 24 insertions(+), 2 deletions(-)
-Index: dracut-042/modules.d/40network/ifup.sh
+Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24
18:02:12.961576972 +0200
-+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:13.849627528
+0200
-@@ -399,6 +399,18 @@ for p in $(getargs ip=); do
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -421,6 +421,18 @@ for p in $(getargs ip=); do
[ "$use_bridge" != 'true' ] && \
[ "$use_vlan" != 'true' ] && continue
@@ -36,9 +36,9 @@
+ fi
+
# setup nameserver
- namesrv="$dns1 $dns2 $(getargs nameserver)"
- for s in $namesrv; do
-@@ -412,7 +424,7 @@ for p in $(getargs ip=); do
+ for s in "$dns1" "$dns2" $(getargs nameserver); do
+ [ -n "$s" ] || continue
+@@ -434,7 +446,7 @@ for p in $(getargs ip=); do
for autoopt in $(str_replace "$autoconf" "," " "); do
case $autoopt in
@@ -47,10 +47,10 @@
do_dhcp -4 ;;
dhcp6)
load_ipv6
-Index: dracut-042/modules.d/40network/module-setup.sh
+Index: dracut-044/modules.d/40network/module-setup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/module-setup.sh 2015-06-24
18:02:05.949177762 +0200
-+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24
18:02:13.849627528 +0200
+--- dracut-044.orig/modules.d/40network/module-setup.sh
++++ dracut-044/modules.d/40network/module-setup.sh
@@ -51,6 +51,10 @@ install() {
_arch=$(uname -m)
@@ -62,11 +62,11 @@
inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
{"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*"
-Index: dracut-042/modules.d/40network/parse-ip-opts.sh
+Index: dracut-044/modules.d/40network/parse-ip-opts.sh
===================================================================
---- dracut-042.orig/modules.d/40network/parse-ip-opts.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/40network/parse-ip-opts.sh 2015-06-24
18:02:13.849627528 +0200
-@@ -67,7 +67,13 @@ for p in $(getargs ip=); do
+--- dracut-044.orig/modules.d/40network/parse-ip-opts.sh
++++ dracut-044/modules.d/40network/parse-ip-opts.sh
+@@ -69,7 +69,13 @@ for p in $(getargs ip=); do
for autoopt in $(str_replace "$autoconf" "," " "); do
case $autoopt in
error) die "Error parsing option 'ip=$p'";;
++++++ 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -13,11 +13,11 @@
lsinitrd.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: dracut-042/dracut.sh
+Index: dracut-044/dracut.sh
===================================================================
---- dracut-042.orig/dracut.sh 2015-06-24 18:02:08.745336946 +0200
-+++ dracut-042/dracut.sh 2015-06-24 18:02:21.906086174 +0200
-@@ -658,7 +658,7 @@ if ! [[ $outfile ]]; then
+--- dracut-044.orig/dracut.sh
++++ dracut-044/dracut.sh
+@@ -632,7 +632,7 @@ if ! [[ $outfile ]]; then
if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L
/boot/${MACHINE_ID} ]] ); then
outfile="/boot/${MACHINE_ID}/$kernel/initrd"
else
@@ -26,10 +26,10 @@
fi
fi
-Index: dracut-042/lsinitrd.sh
+Index: dracut-044/lsinitrd.sh
===================================================================
---- dracut-042.orig/lsinitrd.sh 2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/lsinitrd.sh 2015-06-24 18:02:21.906086174 +0200
+--- dracut-044.orig/lsinitrd.sh
++++ dracut-044/lsinitrd.sh
@@ -89,7 +89,7 @@ else
&& [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then
image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
++++++ 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -13,11 +13,11 @@
modules.d/40network/net-lib.sh | 48 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 43 insertions(+), 5 deletions(-)
-Index: dracut-042/modules.d/40network/net-lib.sh
+Index: dracut-044/modules.d/40network/net-lib.sh
===================================================================
---- dracut-042.orig/modules.d/40network/net-lib.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/40network/net-lib.sh 2015-06-24 18:02:22.802137185
+0200
-@@ -213,20 +213,51 @@ ibft_to_cmdline() {
+--- dracut-044.orig/modules.d/40network/net-lib.sh
++++ dracut-044/modules.d/40network/net-lib.sh
+@@ -241,23 +241,54 @@ ibft_to_cmdline() {
[ -e /tmp/net.${dev}.has_ibft_config ] && continue
@@ -53,10 +53,13 @@
# skip not assigned ip adresses
[ "$ip" = "0.0.0.0" ] && continue
[ -e ${iface}/gateway ] && gw=$(read a < ${iface}/gateway;
echo $a)
+ [ "$gateway" = "0.0.0.0" ] && unset $gateway
[ -e ${iface}/subnet-mask ] && mask=$(read a <
${iface}/subnet-mask; echo $a)
+ [ -e ${iface}/prefix-len ] && prefix=$(read a <
${iface}/prefix-len; echo $a)
[ -e ${iface}/primary-dns ] && dns1=$(read a <
${iface}/primary-dns; echo $a)
+ [ "$dns1" = "0.0.0.0" ] && unset $dns1
[ -e ${iface}/secondary-dns ] && dns2=$(read a <
${iface}/secondary-dns; echo $a)
+ [ "$dns2" = "0.0.0.0" ] && unset $dns2
[ -e ${iface}/hostname ] && hostname=$(read a <
${iface}/hostname; echo $a)
- if [ -n "$ip" ] && [ -n "$mask" ]; then
+ if [ "$family" = "ipv6" ] ; then
@@ -73,7 +76,7 @@
echo
"ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"
else
warn "${iface} does not contain a valid iBFT
configuration"
-@@ -405,6 +436,13 @@ ip_to_var() {
+@@ -436,6 +467,13 @@ ip_to_var() {
esac
;;
esac
++++++ 0125-40network-separate-mask-and-prefix.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -18,12 +18,12 @@
modules.d/40network/parse-ip-opts.sh | 2 +-
3 files changed, 45 insertions(+), 8 deletions(-)
-Index: dracut-042/modules.d/40network/ifup.sh
+Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24
18:02:13.849627528 +0200
-+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:23.090153581
+0200
-@@ -222,13 +222,14 @@ do_static() {
- linkup $netif
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -240,9 +240,10 @@ do_static() {
+
[ -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)
@@ -33,13 +33,17 @@
+ ip addr add $ip/$prefix ${srv:+peer $srv} dev $netif
wait_for_ipv6_dad $netif
else
+ if ! arping -f -q -D -c 2 -I $netif $ip; then
+@@ -250,7 +251,7 @@ do_static() {
+ return 1
+ fi
ip addr flush dev $netif
- ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif
+ ip addr add $ip/$prefix ${srv:+peer $srv} brd + dev $netif
fi
[ -n "$gw" ] && echo ip route replace default via $gw dev $netif >
/tmp/net.$netif.gw
-@@ -404,7 +405,7 @@ for p in $(getargs ip=); do
+@@ -426,7 +427,7 @@ for p in $(getargs ip=); do
# Pull in existing static configuration
. /etc/sysconfig/network/ifcfg-${netif}
ip=${IPADDR}
@@ -48,7 +52,7 @@
mtu=${MTU}
server=${REMOTE_IPADDR}
gw=${GATEWAY}
-@@ -418,7 +419,7 @@ for p in $(getargs ip=); do
+@@ -440,7 +441,7 @@ for p in $(getargs ip=); do
done
# Store config for later use
@@ -57,12 +61,12 @@
eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
done > /tmp/net.$netif.override
-Index: dracut-042/modules.d/40network/net-lib.sh
+Index: dracut-044/modules.d/40network/net-lib.sh
===================================================================
---- dracut-042.orig/modules.d/40network/net-lib.sh 2015-06-24
18:02:22.802137185 +0200
-+++ dracut-042/modules.d/40network/net-lib.sh 2015-06-24 18:02:23.090153581
+0200
-@@ -7,6 +7,35 @@ get_ip() {
- ip=${ip##* }
+--- dracut-044.orig/modules.d/40network/net-lib.sh
++++ dracut-044/modules.d/40network/net-lib.sh
+@@ -20,6 +20,35 @@ get_ip() {
+ echo $ip
}
+mask_to_prefix() {
@@ -97,7 +101,7 @@
iface_for_remote_addr() {
set -- $(ip -o route get to $1)
echo $5
-@@ -204,7 +233,7 @@ ibft_to_cmdline() {
+@@ -232,7 +261,7 @@ ibft_to_cmdline() {
for iface in /sys/firmware/ibft/ethernet*; do
local mac="" dev=""
local dhcp="" ip="" gw="" mask="" hostname=""
@@ -106,7 +110,7 @@
[ -e ${iface}/mac ] || continue
mac=$(read a < ${iface}/mac; echo $a)
-@@ -249,6 +278,7 @@ ibft_to_cmdline() {
+@@ -280,6 +309,7 @@ ibft_to_cmdline() {
[ -e ${iface}/hostname ] && hostname=$(read a <
${iface}/hostname; echo $a)
if [ "$family" = "ipv6" ] ; then
if [ -n "$ip" ] ; then
@@ -114,7 +118,7 @@
[ -n "$prefix" ] || prefix=64
ip="[${ip}/${prefix}]"
mask=
-@@ -256,6 +286,11 @@ ibft_to_cmdline() {
+@@ -287,6 +317,11 @@ ibft_to_cmdline() {
if [ -n "$gw" ] ; then
gw="[${gw}]"
fi
@@ -126,7 +130,7 @@
fi
if [ -n "$ip" ] && [ -n "$mask" -o -n "$prefix" ]; then
echo
"ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}"
-@@ -264,6 +299,7 @@ ibft_to_cmdline() {
+@@ -295,6 +330,7 @@ ibft_to_cmdline() {
warn "ip-addr=$ip"
warn "gateway=$gw"
warn "subnet-mask=$mask"
@@ -134,7 +138,7 @@
warn "hostname=$hostname"
fi
else
-@@ -411,7 +447,7 @@ ip_to_var() {
+@@ -442,7 +478,7 @@ ip_to_var() {
fi
done
@@ -143,7 +147,7 @@
case $# in
0) autoconf="error" ;;
1) autoconf=$1 ;;
-@@ -439,7 +475,7 @@ ip_to_var() {
+@@ -470,7 +506,7 @@ ip_to_var() {
# Extract prefix length from CIDR notation
case $ip in
*/*)
@@ -152,11 +156,11 @@
ip=${ip%/*}
;;
esac
-Index: dracut-042/modules.d/40network/parse-ip-opts.sh
+Index: dracut-044/modules.d/40network/parse-ip-opts.sh
===================================================================
---- dracut-042.orig/modules.d/40network/parse-ip-opts.sh 2015-06-24
18:02:13.849627528 +0200
-+++ dracut-042/modules.d/40network/parse-ip-opts.sh 2015-06-24
18:02:23.090153581 +0200
-@@ -77,7 +77,7 @@ for p in $(getargs ip=); do
+--- dracut-044.orig/modules.d/40network/parse-ip-opts.sh
++++ dracut-044/modules.d/40network/parse-ip-opts.sh
+@@ -79,7 +79,7 @@ for p in $(getargs ip=); do
none|off)
[ -z "$ip" ] && \
die "For argument 'ip=$p'\nValue '$autoopt' without
static configuration does not make sense"
++++++ 0131-40network-handle-prefixed-IP-addresses-correctly.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -14,25 +14,29 @@
modules.d/40network/ifup.sh | 8 ++++++++
1 file changed, 8 insertions(+)
-Index: dracut-042/modules.d/40network/ifup.sh
+Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24
18:02:23.090153581 +0200
-+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:27.658413647
+0200
-@@ -223,11 +223,19 @@ do_static() {
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -241,7 +241,13 @@ do_static() {
[ -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)
+- if strglobin $ip '*:*:*'; then
+ if [ "${ip##*/}" != "${ip}" ] ; then
+ prefix="${ip##*/}"
+ ip="${ip%/*}"
+ fi
- if strglobin $ip '*:*:*'; then
++if strglobin $ip '*:*:*'; then
+ # Always assume /64 prefix for IPv6
+ [ -z "$prefix" ] && prefix=64
# note no ip addr flush for ipv6
ip addr add $ip/$prefix ${srv:+peer $srv} dev $netif
wait_for_ipv6_dad $netif
- else
+@@ -250,6 +256,8 @@ do_static() {
+ warn "Duplicate address detected for $ip for interface $netif."
+ return 1
+ fi
+ # Assume /24 prefix for IPv4
+ [ -z "$prefix" ] && prefix=24
ip addr flush dev $netif
++++++ 0132-40network-fixup-static-network-configuration.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -18,11 +18,11 @@
modules.d/40network/net-lib.sh | 6 +++++-
3 files changed, 20 insertions(+), 1 deletion(-)
-Index: dracut-042/modules.d/40network/ifup.sh
+Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24
18:02:27.658413647 +0200
-+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:27.950430272
+0200
-@@ -241,6 +241,19 @@ do_static() {
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -263,6 +263,19 @@ if strglobin $ip '*:*:*'; then
fi
[ -n "$gw" ] && echo ip route replace default via $gw dev $netif >
/tmp/net.$netif.gw
@@ -42,10 +42,10 @@
[ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" >
/tmp/net.$netif.hostname
return 0
-Index: dracut-042/modules.d/40network/module-setup.sh
+Index: dracut-044/modules.d/40network/module-setup.sh
===================================================================
---- dracut-042.orig/modules.d/40network/module-setup.sh 2015-06-24
18:02:13.849627528 +0200
-+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24
18:02:27.950430272 +0200
+--- dracut-044.orig/modules.d/40network/module-setup.sh
++++ dracut-044/modules.d/40network/module-setup.sh
@@ -53,6 +53,8 @@ install() {
[[ $hostonly ]] && {
++++++ 0138-fips_add_aesni-intel.patch ++++++
Index: dracut-042/modules.d/01fips/module-setup.sh
===================================================================
--- dracut-042.orig/modules.d/01fips/module-setup.sh 2015-06-26
09:52:08.837700391 +0200
+++ dracut-042/modules.d/01fips/module-setup.sh 2015-06-26 09:53:16.613565464
+0200
@@ -20,7 +20,7 @@ installkernel() {
_fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish
wp256 wp384 wp512 xeta xtea xts zlib"
_fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key
ghash_s390 sha1_s390 sha512_s390"
_fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 "
- _fipsmodules+="ghash-clmulni-intel "
+ _fipsmodules+="ghash-clmulni-intel aesni-intel "
_fipsmodules+="drbg"
++++++ 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -17,20 +17,14 @@
modules.d/90crypt/module-setup.sh | 4 ++++
2 files changed, 13 insertions(+)
-Index: dracut-042/modules.d/90crypt/crypt-lib.sh
+Index: dracut-044/modules.d/90crypt/crypt-lib.sh
===================================================================
---- dracut-042.orig/modules.d/90crypt/crypt-lib.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/90crypt/crypt-lib.sh 2015-06-24 18:02:28.878483104
+0200
-@@ -5,11 +5,20 @@ command -v getarg >/dev/null || . /lib/d
- # check if the crypttab contains an entry for a LUKS UUID
- crypttab_contains() {
- local luks="$1"
-+ local _uuid _line
- local l d rest
- if [ -f /etc/crypttab ]; then
- while read l d rest || [ -n "$l" ]; do
- strstr "${l##luks-}" "${luks##luks-}" && return 0
- strstr "$d" "${luks##luks-}" && return 0
+--- dracut-044.orig/modules.d/90crypt/crypt-lib.sh
++++ dracut-044/modules.d/90crypt/crypt-lib.sh
+@@ -16,6 +16,14 @@ crypttab_contains() {
+ [ "$dev" -ef "$_dev" ] && return 0
+ done
+ fi
+ if [ -e /usr/lib/dracut/modules.d/90crypt/block_uuid.map ]; then
+ # search for line starting with $d
+ _line=$(sed -n "\,^$d .*$,{p}"
/usr/lib/dracut/modules.d/90crypt/block_uuid.map)
@@ -42,11 +36,11 @@
done < /etc/crypttab
fi
return 1
-Index: dracut-042/modules.d/90crypt/module-setup.sh
+Index: dracut-044/modules.d/90crypt/module-setup.sh
===================================================================
---- dracut-042.orig/modules.d/90crypt/module-setup.sh 2015-06-11
17:39:47.000000000 +0200
-+++ dracut-042/modules.d/90crypt/module-setup.sh 2015-06-24
18:02:28.882483333 +0200
-@@ -63,6 +63,8 @@ install() {
+--- dracut-044.orig/modules.d/90crypt/module-setup.sh
++++ dracut-044/modules.d/90crypt/module-setup.sh
+@@ -64,6 +64,8 @@ install() {
inst_hook cleanup 30 "$moddir/crypt-cleanup.sh"
fi
@@ -55,7 +49,7 @@
if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then
# filter /etc/crypttab for the devices we need
while read _mapper _dev _rest || [ -n "$_mapper" ]; do
-@@ -72,6 +73,8 @@ install() {
+@@ -73,6 +75,8 @@ install() {
[[ $_dev == UUID=* ]] && \
_dev="/dev/disk/by-uuid/${_dev#UUID=}"
@@ -64,12 +58,12 @@
for _hdev in "${!host_fs_types[@]}"; do
[[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue
if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev
]]; then
-@@ -84,6 +87,8 @@ install() {
+@@ -85,6 +89,8 @@ install() {
fi
inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh"
+ inst_simple $uuid_map_file
"/usr/lib/dracut/modules.d/90crypt/block_uuid.map"
+ rm -f $uuid_map_file
- inst_multiple -o \
- $systemdutildir/system-generators/systemd-cryptsetup-generator \
+ if dracut_module_included "systemd"; then
+ inst_multiple -o \
++++++ 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -5,14 +5,14 @@
Signed-off-by: Thomas Renninger <tr...@suse.de>
---
- dracut-functions.sh | 2 +-
+ dracut-init.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-Index: dracut-042/dracut-functions.sh
+Index: dracut-044/dracut-init.sh
===================================================================
---- dracut-042.orig/dracut-functions.sh 2015-06-24 18:02:08.741336717
+0200
-+++ dracut-042/dracut-functions.sh 2015-06-24 18:02:29.194501095 +0200
-@@ -1657,7 +1657,7 @@ find_kernel_modules_by_path () {
+--- dracut-044.orig/dracut-init.sh
++++ dracut-044/dracut-init.sh
+@@ -1058,7 +1058,7 @@ find_kernel_modules_by_path () {
_OLDIFS=$IFS
IFS=:
while read a rest || [ -n "$a" ]; do
++++++ 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -10,11 +10,11 @@
dracut.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
-Index: dracut-042/dracut.sh
+Index: dracut-044/dracut.sh
===================================================================
---- dracut-042.orig/dracut.sh 2015-06-24 18:02:21.906086174 +0200
-+++ dracut-042/dracut.sh 2015-06-24 18:02:29.490517947 +0200
-@@ -1191,6 +1191,7 @@ if [[ $hostonly ]]; then
+--- dracut-044.orig/dracut.sh
++++ dracut-044/dracut.sh
+@@ -1121,6 +1121,7 @@ if [[ $hostonly ]]; then
"/usr/lib64" \
"/boot" \
"/boot/efi" \
++++++ 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -7,15 +7,15 @@
CC: Jan Loeser <jloe...@suse.de>
---
- dracut-functions.sh | 6 +++++-
+ dracut-init.sh | 6 +++++-
dracut.sh | 12 ++++++++++++
2 files changed, 17 insertions(+), 1 deletions(-)
-Index: dracut-042/dracut-functions.sh
+Index: dracut-044/dracut-init.sh
===================================================================
---- dracut-042.orig/dracut-functions.sh 2015-06-24 18:02:29.194501095
+0200
-+++ dracut-042/dracut-functions.sh 2015-06-24 18:02:29.782534571 +0200
-@@ -1740,8 +1740,14 @@ instmods() {
+--- dracut-044.orig/dracut-init.sh
++++ dracut-044/dracut-init.sh
+@@ -1141,8 +1141,14 @@ instmods() {
--set-version $kernel ${_moddirname} $_mpargs
((_ret+=$?))
else
@@ -31,11 +31,11 @@
fi
;;
esac
-Index: dracut-042/dracut.sh
+Index: dracut-044/dracut.sh
===================================================================
---- dracut-042.orig/dracut.sh 2015-06-24 18:02:29.490517947 +0200
-+++ dracut-042/dracut.sh 2015-06-24 18:02:29.782534571 +0200
-@@ -855,6 +855,18 @@ if [[ -n "$logfile" ]];then
+--- dracut-044.orig/dracut.sh
++++ dracut-044/dracut.sh
+@@ -767,6 +767,18 @@ if [[ -n "$logfile" ]];then
fi
fi
@@ -52,5 +52,5 @@
+done <<< "$(grep -h "^# SUSE INITRD: " /etc/modprobe.d/[0-9][0-9]*.conf)"
+
# handle compression options.
- [[ $compress ]] || compress="gzip"
- case $compress in
+ if [[ $_no_compress_l = "cat" ]]; then
+ compress="cat"
++++++ 0159-network-Try-to-load-xennet.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -10,16 +10,16 @@
modules.d/40network/module-setup.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-Index: dracut-042/modules.d/90kernel-network-modules/module-setup.sh
+Index: dracut-044/modules.d/90kernel-network-modules/module-setup.sh
===================================================================
---- dracut-042.orig/modules.d/90kernel-network-modules/module-setup.sh
2015-06-11 17:39:47.000000000 +0200
-+++ dracut-042/modules.d/90kernel-network-modules/module-setup.sh
2015-06-24 18:02:30.094552334 +0200
+--- dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh
++++ dracut-044/modules.d/90kernel-network-modules/module-setup.sh
@@ -61,7 +61,7 @@ installkernel() {
=drivers/net/phy \
=drivers/net/team \
=drivers/net/ethernet \
- ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net
+ ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net xennet
+ hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs
}
- # called by dracut
++++++ 0182-fix-include-parsing.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -12,11 +12,11 @@
dracut.sh | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
-Index: dracut-043/dracut.sh
+Index: dracut-044/dracut.sh
===================================================================
---- dracut-043.orig/dracut.sh
-+++ dracut-043/dracut.sh
-@@ -310,11 +310,17 @@ dropindirs_sort()
+--- dracut-044.orig/dracut.sh
++++ dracut-044/dracut.sh
+@@ -279,11 +279,17 @@ dropindirs_sort()
rearrange_params()
{
# Workaround -i, --include taking 2 arguments
++++++ 0183-fix_add_drivers_hang.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -10,11 +10,11 @@
dracut.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/dracut.sh b/dracut.sh
-index 44b8a3d..11a4a2e 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1501,7 +1501,7 @@ if [[ $no_kernel != yes ]]; then
+Index: dracut-044/dracut.sh
+===================================================================
+--- dracut-044.orig/dracut.sh
++++ dracut-044/dracut.sh
+@@ -1441,7 +1441,7 @@ if [[ $no_kernel != yes ]]; then
hostonly='' instmods $drivers
fi
@@ -23,6 +23,3 @@
hostonly='' instmods -c $add_drivers
fi
if [[ $force_drivers ]]; then
---
-2.5.1
-
++++++ 0200-dracut_fix_multipath_without_config.patch ++++++
From: Hannes Reinecke <h...@suse.de>
If rootfs is on multipath, but platform does not have an /etc/multipath.conf
file which is not urgently needed, they system will not boot, due to:
multipathd is not started and rootfs and swap are not found:
systemctl status multipathd.service
* multipathd.service - Device-Mapper Multipath Device Controller
Loaded: loaded (/usr/lib/systemd/system/multipathd.service; disabled; vendor
preset: enabled)
Active: inactive (dead)
Condition: start condition failed at Thu 2015-05-07 11:49:11 CEST; 7min ago
ConditionPathExists=/etc/multipath.conf was not met
and exit to dracut shell.
Index: dracut-042/modules.d/90multipath/multipathd.service
===================================================================
--- dracut-042.orig/modules.d/90multipath/multipathd.service 2015-06-11
17:39:47.000000000 +0200
+++ dracut-042/modules.d/90multipath/multipathd.service 2015-06-24
18:02:36.298905539 +0200
@@ -6,7 +6,6 @@ Conflicts=shutdown.target
ConditionKernelCommandLine=!nompath
ConditionKernelCommandLine=!rd.multipath=0
ConditionKernelCommandLine=!rd_NO_MULTIPATH
-ConditionPathExists=/etc/multipath.conf
[Service]
Type=simple
++++++ 0201-fix_nfs_with_ip_instead_of_hostname.patch ++++++
Index: dracut-041/modules.d/95nfs/module-setup.sh
===================================================================
--- dracut-041.orig/modules.d/95nfs/module-setup.sh 2015-05-20
13:37:53.910262273 +0200
+++ dracut-041/modules.d/95nfs/module-setup.sh 2015-05-21 16:16:35.742683551
+0200
@@ -51,9 +51,9 @@
### ip= ###
if [[ $nfs_device = [0-9]*\.[0-9]*\.[0-9]*.[0-9]* ]] || [[ $nfs_device =
\[.*\] ]]; then
- nfs_address="$nfs_device"
+ nfs_address="${nfs_device%%:*}"
else
- lookup=$(host $(echo ${nfs_device%%:*})| head -n1)
+ lookup=$(host "${nfs_device%%:*}"| head -n1)
nfs_address=${lookup##* }
fi
ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^
]*\).*/\1/p')
++++++ 0202-dracut_dmraid_use_udev.patch ++++++
From: Hannes Reinecke <h...@suse.com>
Use udev rules to create dmraid /dev/mapper/ devices
https://bugzilla.opensuse.org/show_bug.cgi?id=905746
---
modules.d/90dmraid/dmraid.sh | 3 ---
modules.d/90dmraid/module-setup.sh | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
Index: dracut-044/modules.d/90dmraid/dmraid.sh
===================================================================
--- dracut-044.orig/modules.d/90dmraid/dmraid.sh
+++ dracut-044/modules.d/90dmraid/dmraid.sh
@@ -33,8 +33,6 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd
if [ "${s##$r}" != "$s" ]; then
info "Activating $s"
dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo
- [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1
| vinfo
- udevsettle
fi
done
done
Index: dracut-044/modules.d/90dmraid/module-setup.sh
===================================================================
--- dracut-044.orig/modules.d/90dmraid/module-setup.sh
+++ dracut-044/modules.d/90dmraid/module-setup.sh
@@ -74,6 +74,8 @@ install() {
inst "$moddir/dmraid.sh" /sbin/dmraid_scan
+ inst_rules 66-kpartx.rules 67-kpartx-compat.rules
+
inst_libdir_file "libdmraid-events*.so*"
inst_rules "$moddir/61-dmraid-imsm.rules"
++++++ 0203-no-fail-builtin-module.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -7,14 +7,14 @@
Signed-off-by: Fabian Vogt <fv...@suse.com>
---
- dracut-functions.sh | 5 +++++
+ dracut-init.sh | 5 +++++
1 file changed, 5 insertions(+)
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index b666446..e5be295 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -1721,6 +1721,11 @@ instmods() {
+Index: dracut-044/dracut-init.sh
+===================================================================
+--- dracut-044.orig/dracut-init.sh
++++ dracut-044/dracut-init.sh
+@@ -1122,6 +1122,11 @@ instmods() {
return 0
fi
@@ -26,6 +26,3 @@
# If we are building a host-specific initramfs and this
# module is not already loaded, move on to the next one.
[[ $hostonly ]] \
---
-2.6.2
-
++++++ 0206-nfs_dns_alias.patch ++++++
From: Fabian Vogt <fv...@suse.com>
Subject: NFS: Support host being a DNS ALIAS
The "host" command may also print something else than
"asdf.local.lan has address 1.2.3.4", like:
"rootserver.local.net is an alias for rainbow.local.net.".
So "head -n1" is not enough.
Fixes boo#955592
---
modules.d/95nfs/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: dracut-043/modules.d/95nfs/module-setup.sh
===================================================================
--- dracut-043.orig/modules.d/95nfs/module-setup.sh
+++ dracut-043/modules.d/95nfs/module-setup.sh
@@ -53,7 +53,7 @@ cmdline() {
if [[ $nfs_device = [0-9]*\.[0-9]*\.[0-9]*.[0-9]* ]] || [[ $nfs_device =
\[.*\] ]]; then
nfs_address="${nfs_device%%:*}"
else
- lookup=$(host "${nfs_device%%:*}"| head -n1)
+ lookup=$(host "${nfs_device%%:*}"| grep " address " | head -n1)
nfs_address=${lookup##* }
fi
ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev \([^
]*\).*/\1/p')
++++++ 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch ++++++
Index: b/modules.d/50plymouth/module-setup.sh
===================================================================
--- a/modules.d/50plymouth/module-setup.sh
+++ b/modules.d/50plymouth/module-setup.sh
@@ -14,9 +14,10 @@ depends() {
# called by dracut
install() {
PKGLIBDIR="/usr/lib/plymouth"
- if type -P dpkg-architecture &>/dev/null; then
- PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
- fi
+ # breaks if dpkg is installed on openSUSE
+ #if type -P dpkg-architecture &>/dev/null; then
+ # PKGLIBDIR="/usr/lib/$(dpkg-architecture
-qDEB_HOST_MULTIARCH)/plymouth"
+ #fi
[ -x /usr/libexec/plymouth/plymouth-populate-initrd ] &&
PKGLIBDIR="/usr/libexec/plymouth"
if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \
++++++ 0402-driver-fail-summary.patch ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -15,15 +15,15 @@
Signed-off-by: Fabian Vogt <fv...@suse.com>
---
- dracut-functions.sh | 11 ++++-------
+ dracut-init.sh | 11 ++++-------
dracut.sh | 9 +++++++++
2 files changed, 13 insertions(+), 7 deletions(-)
-Index: dracut-043/dracut-functions.sh
+Index: dracut-044/dracut-init.sh
===================================================================
---- dracut-043.orig/dracut-functions.sh
-+++ dracut-043/dracut-functions.sh
-@@ -1676,14 +1676,16 @@ instmods() {
+--- dracut-044.orig/dracut-init.sh
++++ dracut-044/dracut-init.sh
+@@ -1077,14 +1077,16 @@ instmods() {
[[ $no_kernel = yes ]] && return
# called [sub]functions inherit _fderr
local _fderr=9
@@ -41,7 +41,7 @@
_silent=yes
shift
fi
-@@ -1765,7 +1767,7 @@ instmods() {
+@@ -1166,7 +1168,7 @@ instmods() {
while read _mod || [ -n "$_mod" ]; do
inst1mod "${_mod%.ko*}" || {
if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]];
then
@@ -50,7 +50,7 @@
fi
}
done
-@@ -1773,7 +1775,7 @@ instmods() {
+@@ -1174,7 +1176,7 @@ instmods() {
while (($# > 0)); do # filenames as arguments
inst1mod ${1%.ko*} || {
if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then
@@ -59,11 +59,11 @@
fi
}
shift
-Index: dracut-043/dracut.sh
+Index: dracut-044/dracut.sh
===================================================================
---- dracut-043.orig/dracut.sh
-+++ dracut-043/dracut.sh
-@@ -420,6 +420,12 @@ verbosity_mod_l=0
+--- dracut-044.orig/dracut.sh
++++ dracut-044/dracut.sh
+@@ -390,6 +390,12 @@ verbosity_mod_l=0
unset kernel
unset outfile
@@ -76,9 +76,9 @@
rearrange_params "$@"
eval set -- "$TEMP"
-@@ -1789,6 +1795,15 @@ if ! (
+@@ -1740,6 +1746,15 @@ if ! (
+ exit 1
fi
- dinfo "*** Creating initrd image file '$outfile' done ***"
+if [[ -s $tmp_dracut_failed_drivers ]]; then
+ dwarn "Some kernel modules could not be included"
@@ -91,4 +91,4 @@
+
if (( maxloglvl >= 5 )); then
if [[ $allowlocal ]]; then
- "$dracutbasedir/lsinitrd.sh" "$outfile"| ddebug
+ "$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img"| ddebug
++++++ dracut-043.tar.xz -> dracut-044.tar.xz ++++++
++++ 9586 lines of diff (skipped)
++++++ dracut-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100
@@ -1,3 +1,4 @@
addFilter("suse-missing-rclink")
addFilter("explicit-lib-dependency")
addFilter("systemd-service-without-service_*_*")
+addFilter("devel-file-in-non-devel-package .* /usr/share/pkgconfig/dracut.pc")
\ No newline at end of file
