diff --git a/kdump-initrd-network.patch b/kdump-initrd-network.patch index 89c9d84..5422c3c 100644 --- a/kdump-initrd-network.patch +++ b/kdump-initrd-network.patch @@ -5,19 +5,26 @@ Patch-mainline: not yet Acked-by: Petr Tesarik --- - init/mkdumprd | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) + init/mkdumprd | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) --- a/init/mkdumprd +++ b/init/mkdumprd -@@ -123,6 +123,26 @@ function run_dracut() +@@ -119,10 +119,34 @@ function run_mkinitrd() + # Create a new initrd using dracut {{{ + function run_dracut() + { ++ local modules="kdump" ++ + . /lib/kdump/setup-kdump.functions DRACUT_ARGS="--force --hostonly --omit 'systemd plymouth resume usrmount'" + # network configuration + if [ "$KDUMP_NETCONFIG" = "auto" ] ; then + status_message "Network: auto" -+ DRACUT_ARGS+=" --kernel-cmdline 'rd.neednet=1'" ++ DRACUT_ARGS+=" --kernel-cmdline 'rd.neednet=1 ip=any'" ++ modules="$modules network" + elif [ -z "$KDUMP_NETCONFIG" ] ; then + status_message "Network: none" + else @@ -32,8 +39,21 @@ Acked-by: Petr Tesarik + status_message "Network mode: Automatic IP (DHCP)" + DRACUT_ARGS+=" --kernel-cmdline 'rd.neednet=1 ip=${interface}:dhcp'" + fi ++ modules="$modules network" + fi + # add mount points kdump_get_mountpoints || return 1 i=0 +@@ -135,8 +159,10 @@ function run_dracut() + done + + # Check for additional modules +- modules="kdump" + for protocol in "${kdump_Protocol[@]}" ; do ++ if [ "$protocol" = "nfs" ]; then ++ modules="$modules nfs" ++ fi + if [ "$protocol" = "cifs" -o "$protocol" = "smb" ]; then + modules="$modules cifs" + fi diff --git a/kdump.changes b/kdump.changes index a0494d1..1449b15 100644 --- a/kdump.changes +++ b/kdump.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Mar 18 10:28:56 UTC 2014 - ptesarik@suse.cz + +- drop dependency on dracut-network again, because this subpackage + has been merged with the main dracut package + +------------------------------------------------------------------- +Mon Mar 17 14:39:01 UTC 2014 - ptesarik@suse.cz + +- kdump-initrd-network.patch: fix KDUMP_NETCONFIG="auto" + +------------------------------------------------------------------- +Mon Mar 17 12:33:49 UTC 2014 - ptesarik@suse.cz + +- add dependency on dracut-network in SLE12 and Factory +- kdump-initrd-network.patch: include dracut 'network' module if + network is required + ------------------------------------------------------------------- Fri Mar 14 11:03:35 UTC 2014 - ptesarik@suse.cz