Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked in at 2016-02-03 10:19:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-01 09:17:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2016-02-03 10:19:24.000000000 +0100
@@ -1,0 +2,56 @@
+Mon Feb 1 09:38:46 UTC 2016 - fvogt@suse.com
+
+- Fix 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe.patch:
+ - Patch did not have any effect whatsoever
+ - Fixes bsc#869496
+ - Rename from 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch
+
+-------------------------------------------------------------------
+Thu Jan 28 10:18:18 UTC 2016 - pwieczorkiewicz@suse.com
+
+- Add 0169-network_set_mtu_macaddr_for_dhcp.patch:
+ - Set MTU and LLADDR for DHCP if specified (boo#959803)
+
+-------------------------------------------------------------------
+Wed Jan 27 09:19:18 UTC 2016 - fvogt@suse.com
+
+- Modify 0017-45ifcfg-use-distro-specific-scripts.patch:
+ - Also revert upstream commit f34e1d6b to not forcibly
+ include network and ifcfg modules (bsc#960669)
+- Refresh:
+ - 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch
+ - 0132-40network-fixup-static-network-configuration.patch
+ - 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch
+ - 0402-driver-fail-summary.patch
+
+-------------------------------------------------------------------
+Wed Jan 27 07:47:55 UTC 2016 - fvogt@suse.com
+
+- Add 0209-fix_modules_load_d_hostonly.patch:
+ - Fix modules-load.d with hostonly (boo#962224)
+
+-------------------------------------------------------------------
+Tue Jan 26 11:08:04 UTC 2016 - fvogt@suse.com
+
+- Add 0208-no_forced_virtnet.patch:
+ Don't include qemu-net modules without reason.
+ Fix for bsc#960669
+
+-------------------------------------------------------------------
+Fri Jan 22 13:18:33 UTC 2016 - fvogt@suse.com
+
+- Refresh and merge:
+ 0133-Allow-multiple-configurations-per-network-interface-.patch
+ 0145-40network-handle-ip-ifname-static-correctly.patch
+ 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch
+- Delete 0134-Remove-bootdev-warning-bnc-881112.patch:
+ - ip=ibft got deprecated, so workaround not necessary
+
+-------------------------------------------------------------------
+Thu Jan 21 11:33:47 UTC 2016 - fvogt@suse.com
+
+- Add 0207-handle_module_aliases.patch:
+ Handle module aliases correctly to not generate unbootable
+ initrds with different kernel versions. Fix for boo#962694
+
+-------------------------------------------------------------------
Old:
----
0134-Remove-bootdev-warning-bnc-881112.patch
0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch
New:
----
0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe.patch
0169-network_set_mtu_macaddr_for_dhcp.patch
0207-handle_module_aliases.patch
0208-no_forced_virtnet.patch
0209-fix_modules_load_d_hostonly.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dracut
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -46,8 +46,12 @@
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
+Patch133: 0133-Allow-multiple-configurations-per-network-interface-.patch
Patch142: 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch
+Patch145: 0145-40network-handle-ip-ifname-static-correctly.patch
Patch159: 0159-network-Try-to-load-xennet.patch
+Patch162: 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch
+Patch169: 0169-network_set_mtu_macaddr_for_dhcp.patch
#S390
Patch16: 0016-Add-new-s390x-specific-rule-files.patch
@@ -92,7 +96,7 @@
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
+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
Patch168: 0168-remove_plymouth_logo_file.patch
@@ -101,12 +105,6 @@
Patch182: 0182-fix-include-parsing.patch
Patch183: 0183-fix_add_drivers_hang.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
-
# Submit mainline asap
Patch128: 0128-90lvm-Install-dm-snapshot-module.patch
Patch200: 0200-dracut_fix_multipath_without_config.patch
@@ -116,6 +114,9 @@
Patch204: 0204-mkinitrd-fix-monster.patch
Patch205: 0205-mdraid_ignore_hostonly.patch
Patch206: 0206-nfs_dns_alias.patch
+Patch207: 0207-handle_module_aliases.patch
+Patch208: 0208-no_forced_virtnet.patch
+Patch209: 0209-fix_modules_load_d_hostonly.patch
## SUSE-specific fixes
Patch300: 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch
@@ -234,25 +235,24 @@
%patch130 -p1
%patch131 -p1
%patch132 -p1
-
-# Still needed!
-#patch133 -p1
-#patch134 -p1
-#patch145 -p1
-#patch162 -p1
+%patch133 -p1
%patch137 -p1
%patch138 -p1
%patch142 -p1
%patch144 -p1
+%patch145 -p1
%patch150 -p1
%patch157 -p1
%patch158 -p1
%patch159 -p1
+%patch162 -p1
%patch163 -p1
%patch164 -p1
%patch168 -p1
+%patch169 -p1
+
%patch180 -p1
# disabled, as it breaks encrypted / on LVM - dimstar, 20151001
#patch181 -p1
@@ -266,6 +266,9 @@
%patch204 -p1
%patch205 -p1
%patch206 -p1
+%patch207 -p1
+%patch208 -p1
+%patch209 -p1
%patch300 -p1
%patch301 -p1
++++++ 0017-45ifcfg-use-distro-specific-scripts.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -9,12 +9,17 @@
each upgrade. Handle this in the spec file and a separate
write-ifcfg-suse.sh source file
+ - Also revert upstream commit f34e1d6, to not forcibly include 45ifcfg
+ and thus the whole network stack (bsc#960669)
+
Signed-off-by: Hannes Reinecke
Modified-by: Thomas Rennigner
+Modified-by: Fabian Vogt
---
- modules.d/40network/ifup.sh | 1 +
- modules.d/45ifcfg/module-setup.sh | 8 +++++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
+ modules.d/40network/ifup.sh | 1 +
+ modules.d/40network/module-setup.sh | 7 +++++++
+ modules.d/45ifcfg/module-setup.sh | 1 -
+ 3 files changed, 8 insertions(+), 1 deletion(-)
Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
@@ -32,18 +37,29 @@
===================================================================
--- dracut-044.orig/modules.d/45ifcfg/module-setup.sh
+++ dracut-044/modules.d/45ifcfg/module-setup.sh
-@@ -2,7 +2,13 @@
+@@ -2,7 +2,6 @@
# called by dracut
check() {
- [[ -d /etc/sysconfig/network-scripts ]] && return 0
+ return 255
+ }
+
+Index: dracut-044/modules.d/40network/module-setup.sh
+===================================================================
+--- dracut-044.orig/modules.d/40network/module-setup.sh
++++ dracut-044/modules.d/40network/module-setup.sh
+@@ -15,6 +15,13 @@ check() {
+ # called by dracut
+ depends() {
+ echo "kernel-network-modules"
+ local link=$(readlink $moddir/write-ifcfg.sh)
+ [[ "$link" = "write-ifcfg-suse.sh" ]] && \
+ [[ -d /etc/sysconfig/network ]] && \
-+ return 0
++ echo "ifcfg"
+ [[ "$link" = "write-ifcfg-redhat.sh" ]] && \
+ [[ -d /etc/sysconfig/network-scripts ]] && \
-+ return 0
- return 255
++ echo "ifcfg"
+ return 0
}
++++++ 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -51,7 +51,7 @@
===================================================================
--- dracut-044.orig/modules.d/40network/module-setup.sh
+++ dracut-044/modules.d/40network/module-setup.sh
-@@ -51,6 +51,10 @@ install() {
+@@ -58,6 +58,10 @@ install() {
_arch=$(uname -m)
++++++ 0132-40network-fixup-static-network-configuration.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -46,7 +46,7 @@
===================================================================
--- dracut-044.orig/modules.d/40network/module-setup.sh
+++ dracut-044/modules.d/40network/module-setup.sh
-@@ -53,6 +53,8 @@ install() {
+@@ -60,6 +60,8 @@ install() {
[[ $hostonly ]] && {
inst_multiple /etc/sysconfig/network/ifcfg-*
++++++ 0133-Allow-multiple-configurations-per-network-interface-.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -12,11 +12,11 @@
modules.d/40network/parse-ip-opts.sh | 14 ++---
5 files changed, 70 insertions(+), 45 deletions(-)
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 84dc530..0362287 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -91,6 +91,7 @@ else
+Index: dracut-044/modules.d/40network/ifup.sh
+===================================================================
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -90,6 +90,7 @@ else
fi
dhcp_apply() {
@@ -24,7 +24,7 @@
if [ -f /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} ]; then
. /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
else
-@@ -132,24 +133,37 @@ dhcp_apply() {
+@@ -131,24 +132,37 @@ dhcp_apply() {
[ -n "${HOSTNAME}" ] && hostname "$HOSTNAME"
# If nameserver= has not been specified, use what dhcp provides
@@ -69,7 +69,7 @@
info "DHCP is finished successfully"
return 0
}
-@@ -171,9 +185,6 @@ do_dhcp() {
+@@ -175,9 +189,6 @@ do_dhcp() {
dhclient="wickedd-dhcp6"
fi
@@ -79,7 +79,7 @@
if ! iface_has_link $netif; then
warn "No carrier detected"
warn "Trying to set $netif up..."
-@@ -188,7 +199,6 @@ do_dhcp() {
+@@ -191,7 +202,6 @@ do_dhcp() {
$dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
dhcp_apply $1 || return $?
@@ -87,7 +87,7 @@
echo $netif > /tmp/setup_net_${netif}.ok
return 0
}
-@@ -218,6 +228,31 @@ do_ipv6auto() {
+@@ -222,6 +232,31 @@ do_ipv6auto() {
# Handle static ip configuration
do_static() {
@@ -118,16 +118,16 @@
+do_static_setup() {
strglobin $ip '*:*:*' && load_ipv6
- linkup $netif
-@@ -237,7 +272,6 @@ do_static() {
- else
+ if ! linkup $netif; then
+@@ -258,7 +293,6 @@ if strglobin $ip '*:*:*'; then
+ fi
# Assume /24 prefix for IPv4
[ -z "$prefix" ] && prefix=24
- ip addr flush dev $netif
ip addr add $ip/$prefix ${srv:+peer $srv} brd + dev $netif
fi
-@@ -256,8 +290,6 @@ do_static() {
+@@ -277,8 +311,6 @@ if strglobin $ip '*:*:*'; then
done
[ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
@@ -136,7 +136,7 @@
}
# loopback is always handled the same way
-@@ -404,6 +436,14 @@ for p in $(getargs ip=); do
+@@ -426,6 +458,14 @@ for p in $(getargs ip=); do
ip_to_var $p
# skip ibft
[ "$autoconf" = "ibft" ] && continue
@@ -151,7 +151,7 @@
case "$dev" in
??:??:??:??:??:??) # MAC address
-@@ -421,29 +461,12 @@ for p in $(getargs ip=); do
+@@ -443,29 +483,12 @@ for p in $(getargs ip=); do
[ "$use_bridge" != 'true' ] && \
[ "$use_vlan" != 'true' ] && continue
@@ -168,8 +168,8 @@
- fi
-
# setup nameserver
- namesrv="$dns1 $dns2 $(getargs nameserver)"
- for s in $namesrv; do
+ for s in "$dns1" "$dns2" $(getargs nameserver); do
+ [ -n "$s" ] || continue
echo nameserver $s >> /tmp/net.$netif.resolv.conf
done
@@ -178,18 +178,19 @@
- eval '[ "$'$i'" ] && echo '$i'="$'$i'"'
- done > /tmp/net.$netif.override
-
- case $autoconf in
- dhcp4|dhcp|on|any)
- do_dhcp -4 ;;
-@@ -466,7 +489,6 @@ for p in $(getargs ip=); do
+ for autoopt in $(str_replace "$autoconf" "," " "); do
+ case $autoopt in
+ dhcp4|dhcp|on|any)
+@@ -493,8 +516,6 @@ for p in $(getargs ip=); do
+ /sbin/netroot $netif
fi
fi
-
+-
- exit 0
done
# netif isn't the top stack? Then we should exit here.
-@@ -486,4 +508,9 @@ if [ ! -e /tmp/net.${netif}.up ]; then
+@@ -523,4 +544,9 @@ if [ ! -e /tmp/net.${netif}.up ]; then
fi
fi
@@ -199,11 +200,11 @@
+ > /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
+fi
exit 0
-diff --git a/modules.d/40network/net-genrules.sh b/modules.d/40network/net-genrules.sh
-index 2fd8c6b..9d0ed20 100755
---- a/modules.d/40network/net-genrules.sh
-+++ b/modules.d/40network/net-genrules.sh
-@@ -99,7 +99,7 @@ command -v fix_bootif >/dev/null || . /lib/net-lib.sh
+Index: dracut-044/modules.d/40network/net-genrules.sh
+===================================================================
+--- dracut-044.orig/modules.d/40network/net-genrules.sh
++++ dracut-044/modules.d/40network/net-genrules.sh
+@@ -96,7 +96,7 @@ command -v fix_bootif >/dev/null || . /l
# if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh
if [ "$NEEDNET" = "1" ]; then
echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
@@ -212,11 +213,11 @@
fi
fi
-diff --git a/modules.d/40network/net-lib.sh b/modules.d/40network/net-lib.sh
-index fce845a..e8d898a 100755
---- a/modules.d/40network/net-lib.sh
-+++ b/modules.d/40network/net-lib.sh
-@@ -111,6 +111,7 @@ ifdown() {
+Index: dracut-044/modules.d/40network/net-lib.sh
+===================================================================
+--- dracut-044.orig/modules.d/40network/net-lib.sh
++++ dracut-044/modules.d/40network/net-lib.sh
+@@ -130,6 +130,7 @@ ifdown() {
ip addr flush dev $netif
echo "#empty" > /etc/resolv.conf
rm -f -- /tmp/net.$netif.did-setup
@@ -224,7 +225,7 @@
[ -e /sys/class/net/$netif/address ] && \
rm -f -- /tmp/net.$(cat /sys/class/net/$netif/address).did-setup
# TODO: send "offline" uevent?
-@@ -165,9 +166,6 @@ setup_net() {
+@@ -202,9 +203,6 @@ setup_net() {
fi
unset layer2
@@ -234,36 +235,24 @@
}
save_netinfo() {
-diff --git a/modules.d/40network/parse-ibft.sh b/modules.d/40network/parse-ibft.sh
-index 9776c75..b81ddb1 100755
---- a/modules.d/40network/parse-ibft.sh
-+++ b/modules.d/40network/parse-ibft.sh
-@@ -6,5 +6,7 @@ command -v getarg >/dev/null || . /lib/dracut-lib.sh
- command -v ibft_to_cmdline >/dev/null || . /lib/net-lib.sh
-
- # If ibft is requested, read ibft vals and write ip=XXX cmdline args
--[ "ibft" = "$(getarg ip=)" ] && ibft_to_cmdline
-+for i in $(getargs ip=); do
-+ [ "ibft" = "$i" ] && ibft_to_cmdline && break
-+done
-
-diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
-index 52a1923..13bc45c 100755
---- a/modules.d/40network/parse-ip-opts.sh
-+++ b/modules.d/40network/parse-ip-opts.sh
-@@ -78,24 +78,22 @@ for p in $(getargs ip=); do
- die "Sorry, automatic calculation of netmask is not yet supported"
- ;;
- auto6);;
-- dhcp|dhcp6|on|any) \
-- [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
-- die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
-- [ -n "$ip" ] && \
-- die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoconf'"
-- ;;
-+ dhcp|dhcp6|on|any) ;;
- *) die "For argument 'ip=$p'\nSorry, unknown value '$autoconf'";;
- esac
+Index: dracut-044/modules.d/40network/parse-ip-opts.sh
+===================================================================
+--- dracut-044.orig/modules.d/40network/parse-ip-opts.sh
++++ dracut-044/modules.d/40network/parse-ip-opts.sh
+@@ -83,25 +83,23 @@ for p in $(getargs ip=); do
+ die "Sorry, automatic calculation of netmask is not yet supported"
+ ;;
+ auto6);;
+- dhcp|dhcp6|on|any) \
+- [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
+- die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
+- [ -n "$ip" ] && \
+- die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoopt'"
+- ;;
++ dhcp|dhcp6|on|any);;
+ *) die "For argument 'ip=$p'\nSorry, unknown value '$autoopt'";;
+ esac
+ done
+ dup=0
if [ -n "$dev" ] ; then
@@ -277,11 +266,8 @@
# IFACES list for later use
- IFACES="$IFACES $dev"
+ if [ $dup -eq 0 ]; then
-+ IFACES="$IFACES $dev"
++ IFACES="$IFACES $dev"
+ fi
fi
# Do we need to check for specific options?
---
-1.7.6.1
-
++++++ 0142-40network-Don-t-report-error-for-etc-sysconfig-netwo.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -9,11 +9,11 @@
modules.d/40network/module-setup.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-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:27.950430272 +0200
-+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24 18:02:28.582466253 +0200
-@@ -53,7 +53,7 @@ install() {
+--- dracut-044.orig/modules.d/40network/module-setup.sh
++++ dracut-044/modules.d/40network/module-setup.sh
+@@ -60,7 +60,7 @@ install() {
[[ $hostonly ]] && {
inst_multiple /etc/sysconfig/network/ifcfg-*
++++++ 0145-40network-handle-ip-ifname-static-correctly.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -16,11 +16,11 @@
modules.d/40network/ifup.sh | 40 ++++++++++++++++++++++++++++++----------
1 file changed, 30 insertions(+), 10 deletions(-)
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 0362287..5cd4f68 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -178,11 +178,13 @@ do_dhcp() {
+Index: dracut-044/modules.d/40network/ifup.sh
+===================================================================
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -182,11 +182,13 @@ do_dhcp() {
info "Preparation for DHCP transaction"
@@ -37,7 +37,7 @@
fi
if ! iface_has_link $netif; then
-@@ -226,33 +228,49 @@ do_ipv6auto() {
+@@ -230,33 +232,49 @@ do_ipv6auto() {
return 0
}
@@ -93,16 +93,13 @@
+do_static() {
strglobin $ip '*:*:*' && load_ipv6
- linkup $netif
-@@ -475,6 +493,8 @@ for p in $(getargs ip=); do
- do_dhcp -6 ;;
- auto6)
- do_ipv6auto ;;
-+ static)
-+ do_ifcfg ;;
- *)
- do_static ;;
- esac
---
-1.8.4.5
-
+ if ! linkup $netif; then
+@@ -498,6 +516,8 @@ for p in $(getargs ip=); do
+ do_dhcp -6 ;;
+ auto6)
+ do_ipv6auto ;;
++ static)
++ do_ifcfg ;;
+ *)
+ do_static ;;
+ esac
++++++ 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch -> 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe.patch ++++++
--- /work/SRC/openSUSE:Factory/dracut/0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch 2015-12-01 09:17:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new/0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe.patch 2016-02-03 10:19:23.000000000 +0100
@@ -1,11 +1,11 @@
From 75faba5ea84fe53df7d3ca3e4f4b6cf390c824bb Mon Sep 17 00:00:00 2001
-From: Jan Loseser
+From: Jan Loeser
Date: Thu, 11 Sep 2014 15:20:23 +0200
Subject: Add SUSE kernel module dependencies (in /etc/modprobe.d/*)
bnc#895331
-CC: Jan Loeser
+Fixed-by: Fabian Vogt
---
dracut-init.sh | 6 +++++-
dracut.sh | 12 ++++++++++++
@@ -15,7 +15,21 @@
===================================================================
--- dracut-044.orig/dracut-init.sh
+++ dracut-044/dracut-init.sh
-@@ -1141,8 +1141,14 @@ instmods() {
+@@ -944,6 +944,13 @@ for_each_kmod_dep() {
+ $_func ${_modpath} || exit $?
+ done
+ )
++
++ for suse_mod_dep in ${suse_mod_deps["${_kmod%.ko*}"]}; do
++ _modpath=$(modinfo -k "$kernel" -F filename "$suse_mod_dep" 2> /dev/null)
++ [ -n "$_modpath" ] || continue
++ for_each_kmod_dep "$_func" "$_modpath" "$@"
++ $_func ${_modpath} || exit $?
++ done
+ }
+
+ dracut_kernel_post() {
+@@ -1141,8 +1148,14 @@ instmods() {
--set-version $kernel ${_moddirname} $_mpargs
((_ret+=$?))
else
++++++ 0162-network-Request-DHCP-lease-instead-of-getting-applyi.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -12,11 +12,11 @@
modules.d/40network/ifup.sh | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 5cd4f68..1ff1a4a 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -182,9 +182,15 @@ do_dhcp() {
+Index: dracut-044/modules.d/40network/ifup.sh
+===================================================================
+--- dracut-044.orig/modules.d/40network/ifup.sh
++++ dracut-044/modules.d/40network/ifup.sh
+@@ -186,9 +186,15 @@ do_dhcp() {
local dhclient=''
if [ "$1" = "-6" ] ; then
@@ -34,24 +34,24 @@
fi
if ! iface_has_link $netif; then
-@@ -198,10 +204,14 @@ do_dhcp() {
+@@ -201,10 +207,14 @@ do_dhcp() {
+ fi
fi
- echo "Starting dhcp for interface $netif"
- $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
+ $dhclient --test-format leaseinfo --test-output /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} --test-request - $netif << EOF
+<request type="lease"/>
+EOF
dhcp_apply $1 || return $?
+
+ if [ "$1" = "-6" ] ; then
+ wait_for_ipv6_dad $netif
+ fi
-
- echo $netif > /tmp/setup_net_${netif}.ok
return 0
}
-@@ -220,6 +230,7 @@ do_ipv6auto() {
+@@ -224,6 +234,7 @@ do_ipv6auto() {
echo 0 > /proc/sys/net/ipv6/conf/$netif/forwarding
echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_ra
echo 1 > /proc/sys/net/ipv6/conf/$netif/accept_redirects
@@ -59,14 +59,11 @@
linkup $netif
wait_for_ipv6_auto $netif
-@@ -492,6 +503,7 @@ for p in $(getargs ip=); do
- load_ipv6
- do_dhcp -6 ;;
- auto6)
-+ echo $netif > /tmp/net.$netif.auto6
- do_ipv6auto ;;
- static)
- do_ifcfg ;;
---
-1.7.6.1
-
+@@ -515,6 +526,7 @@ for p in $(getargs ip=); do
+ load_ipv6
+ do_dhcp -6 ;;
+ auto6)
++ echo $netif > /tmp/net.$netif.auto6
+ do_ipv6auto ;;
+ static)
+ do_ifcfg ;;
++++++ 0169-network_set_mtu_macaddr_for_dhcp.patch ++++++
Index: dracut-044/modules.d/40network/ifup.sh
===================================================================
--- dracut-044.orig/modules.d/40network/ifup.sh
+++ dracut-044/modules.d/40network/ifup.sh
@@ -90,7 +90,7 @@ else
fi
dhcp_apply() {
- unset IPADDR INTERFACE BROADCAST NETWORK PREFIXLEN ROUTES GATEWAYS HOSTNAME DNSDOMAIN DNSSEARCH DNSSERVERS
+ unset IPADDR INTERFACE BROADCAST NETWORK PREFIXLEN ROUTES GATEWAYS MTU HOSTNAME DNSDOMAIN DNSSEARCH DNSSERVERS
if [ -f /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} ]; then
. /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
else
@@ -128,6 +128,9 @@ dhcp_apply() {
done
fi
+ # Set MTU
+ [ -n "${MTU}" ] && ip $1 link set mtu "$MTU" dev "$INTERFACE"
+
# Setup hostname
[ -n "${HOSTNAME}" ] && hostname "$HOSTNAME"
@@ -167,6 +170,25 @@ dhcp_apply() {
return 0
}
+read_ifcfg() {
+ unset PREFIXLEN LLADDR MTU REMOTE_IPADDR GATEWAY BOOTPROTO
+
+ if [ -e /etc/sysconfig/network/ifcfg-${netif} ] ; then
+ # Pull in existing configuration
+ . /etc/sysconfig/network/ifcfg-${netif}
+
+ # The first configuration can be anything
+ [ -n "$PREFIXLEN" ] && prefix=${PREFIXLEN}
+ [ -n "$LLADDR" ] && macaddr=${LLADDR}
+ [ -n "$MTU" ] && mtu=${MTU}
+ [ -n "$REMOTE_IPADDR" ] && server=${REMOTE_IPADDR}
+ [ -n "$GATEWAY" ] && gw=${GATEWAY}
+ [ -n "$BOOTPROTO" ] && autoconf=${BOOTPROTO}
+ return 0
+ fi
+ return 1
+}
+
# Run dhclient
do_dhcp() {
# dhclient-script will mark the netif up and generate the online
@@ -197,14 +219,14 @@ do_dhcp() {
dhclient="wickedd-dhcp4 --test"
fi
- if ! iface_has_link $netif; then
- warn "No carrier detected"
- warn "Trying to set $netif up..."
- ip $1 link set dev "$netif" up
- if ! iface_has_link $netif; then
- warn "Failed..."
- return 1
- fi
+ if ! linkup $netif; then
+ warn "Could not bring interface $netif up!"
+ return 1
+ fi
+
+ if read_ifcfg ; then
+ [ -n "$macaddr" ] && ip $1 link set address $macaddr dev $netif
+ [ -n "$mtu" ] && ip $1 link set mtu $mtu dev $netif
fi
$dhclient --test-format leaseinfo --test-output /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} --test-request - $netif << EOF
@@ -245,17 +267,7 @@ do_ipv6auto() {
# Handle ip configuration via ifcfg files
do_ifcfg() {
- if [ "$autoconf" = "static" ] &&
- [ -e /etc/sysconfig/network/ifcfg-${netif} ] ; then
- # Pull in existing static configuration
- . /etc/sysconfig/network/ifcfg-${netif}
-
- # The first configuration can be anything
- [ -n "$PREFIXLEN" ] && prefix=${PREFIXLEN}
- [ -n "$MTU" ] && mtu=${MTU}
- [ -n "$REMOTE_IPADDR" ] && server=${REMOTE_IPADDR}
- [ -n "$GATEWAY" ] && gw=${GATEWAY}
- [ -n "$BOOTPROTO" ] && autoconf=${BOOTPROTO}
+ if [ "$autoconf" = "static" ] && read_ifcfg; then
case "$autoconf" in
dhcp6)
load_ipv6
++++++ 0207-handle_module_aliases.patch ++++++
From: Fabian Vogt
Date: Thu, 21 Jan 2016 12:38:05 +0100
Subject: [PATCH] Correctly handle module aliases
Handle module aliases correctly to not generate unbootable
initrds with different kernel versions. Fix for boo#962694
See the diff for a detailed explanation.
---
dracut.sh | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
Index: dracut-044/dracut.sh
===================================================================
--- dracut-044.orig/dracut.sh
+++ dracut-044/dracut.sh
@@ -1214,6 +1214,27 @@ if [[ $hostonly ]]; then
while read m rest || [ -n "$m" ]; do
host_modules["$m"]=1
done = 4.4, mpt2sas isn't loaded,
+ # so it's not included.
+ # Both ways result in an unbootable initrd.
+
+ # also add aliases of loaded modules
+ for mod in "${!host_modules[@]}"; do
+ aliases=$(modinfo -F alias "$mod" 2>&1)
+ for alias in $aliases; do
+ host_modules["$alias"]=1
+ done
+ # mod might be an alias in the target kernel, find the real module
+ mod_filename=$(modinfo -k "$kernel" "$mod" -F filename)
+ [ $? -ne 0 ] && continue
+ host_modules["$(basename -s .ko "$mod_filename")"]=1
+ done
fi
unset m
++++++ 0208-no_forced_virtnet.patch ++++++
From: Fabian Vogt
Subject: Don't include qemu network modules without reason
virtio-net without other network tools does not make sense
and causes various bugs, like bsc#960669.
---
modules.d/90kernel-network-modules/module-setup.sh | 24 ++++++++++++++++++++-
modules.d/90qemu-net/module-setup.sh | 1
2 files changed, 24 insertions(+), 1 deletion(-)
Index: dracut-044/modules.d/90kernel-network-modules/module-setup.sh
===================================================================
--- dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh
+++ dracut-044/modules.d/90kernel-network-modules/module-setup.sh
@@ -10,6 +10,25 @@ depends() {
return 0
}
+running_in_qemu() {
+ if type -P systemd-detect-virt >/dev/null 2>&1; then
+ vm=$(systemd-detect-virt --vm >/dev/null 2>&1)
+ (($? != 0)) && return 255
+ [[ $vm = "qemu" ]] && return 0
+ [[ $vm = "kvm" ]] && return 0
+ [[ $vm = "bochs" ]] && return 0
+ fi
+
+ for i in /sys/class/dmi/id/*_vendor; do
+ [[ -f $i ]] || continue
+ read vendor < $i
+ [[ "$vendor" == "QEMU" ]] && return 0
+ [[ "$vendor" == "Bochs" ]] && return 0
+ done
+
+ return 255
+}
+
# called by dracut
installkernel() {
# Include wired net drivers, excluding wireless
@@ -63,6 +82,8 @@ installkernel() {
=drivers/net/ethernet \
ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net xennet
hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs
+
+ running_in_qemu && hostonly='' instmods virtio_net e1000 8139cp pcnet32 e100 ne2k_pci
}
# called by dracut
Index: dracut-044/modules.d/90qemu-net/module-setup.sh
===================================================================
--- dracut-044.orig/modules.d/90qemu-net/module-setup.sh
+++ dracut-044/modules.d/90qemu-net/module-setup.sh
@@ -2,6 +2,7 @@
# called by dracut
check() {
+ return 255
if type -P systemd-detect-virt >/dev/null 2>&1; then
vm=$(systemd-detect-virt --vm >/dev/null 2>&1)
(($? != 0)) && return 255
++++++ 0209-fix_modules_load_d_hostonly.patch ++++++
From: Fabian Vogt
Subject: Fix loading of modules in modules-load.d
With hostonly enabled, only modules that are currently
loaded are included in the initrd. Modules which are
explicitly listed in modules-load.d do not need to
be filtered that way. Fix for boo#962224.
---
modules.d/00systemd/module-setup.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: dracut-044/modules.d/00systemd/module-setup.sh
===================================================================
--- dracut-044.orig/modules.d/00systemd/module-setup.sh
+++ dracut-044/modules.d/00systemd/module-setup.sh
@@ -154,7 +154,7 @@ install() {
}
_mods=$(modules_load_get /usr/lib/modules-load.d)
- [[ $_mods ]] && instmods $_mods
+ [[ $_mods ]] && hostonly='' instmods $_mods
if [[ $hostonly ]]; then
inst_multiple -H -o \
@@ -169,7 +169,7 @@ install() {
/etc/sysctl.conf
_mods=$(modules_load_get /etc/modules-load.d)
- [[ $_mods ]] && instmods $_mods
+ [[ $_mods ]] && hostonly='' instmods $_mods
fi
if ! [[ -e "$initdir/etc/machine-id" ]]; then
++++++ 0402-driver-fail-summary.patch ++++++
--- /var/tmp/diff_new_pack.Y3XDtC/_old 2016-02-03 10:19:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Y3XDtC/_new 2016-02-03 10:19:26.000000000 +0100
@@ -76,7 +76,7 @@
rearrange_params "$@"
eval set -- "$TEMP"
-@@ -1740,6 +1746,15 @@ if ! (
+@@ -1761,6 +1767,15 @@ if ! (
exit 1
fi