Hello community, here is the log from the commit of package kdump for openSUSE:Factory checked in at 2014-03-18 14:14:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdump (Old) and /work/SRC/openSUSE:Factory/.kdump.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdump" Changes: -------- --- /work/SRC/openSUSE:Factory/kdump/kdump.changes 2014-03-14 15:16:34.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdump.new/kdump.changes 2014-03-18 14:14:40.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Mar 18 10:28:56 UTC 2014 - [email protected] + +- 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 - [email protected] + +- kdump-initrd-network.patch: fix KDUMP_NETCONFIG="auto" + +------------------------------------------------------------------- +Mon Mar 17 12:33:49 UTC 2014 - [email protected] + +- add dependency on dracut-network in SLE12 and Factory +- kdump-initrd-network.patch: include dracut 'network' module if + network is required + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdump-initrd-network.patch ++++++ --- /var/tmp/diff_new_pack.NzERd9/_old 2014-03-18 14:14:40.000000000 +0100 +++ /var/tmp/diff_new_pack.NzERd9/_new 2014-03-18 14:14:40.000000000 +0100 @@ -5,19 +5,26 @@ Acked-by: Petr Tesarik <[email protected]> --- - 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 @@ + 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
