pool/kdump
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 226568 from Kernel:kdump

Browse Source 
fix KDUMP_NETCONFIG and drop dependency on dracut-network again (merged with dracut)

OBS-URL: https://build.opensuse.org/request/show/226568
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdump?expand=0&rev=65
This commit is contained in:
Stephan Kulow 2014-03-18 13:14:39 +00:00 committed by Git OBS Bridge
commit 68fa6d81a6
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kdump-initrd-network.patch
View File

@ -5,19 +5,26 @@ Patch-mainline: not yet
Acked-by: Petr Tesarik <ptesarik@suse.cz> Acked-by: Petr Tesarik <ptesarik@suse.cz>
--- ---
init/mkdumprd | 20 ++++++++++++++++++++ init/mkdumprd | 28 +++++++++++++++++++++++++++-
1 file changed, 20 insertions(+) 1 file changed, 27 insertions(+), 1 deletion(-)
--- a/init/mkdumprd --- a/init/mkdumprd
+++ b/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'" DRACUT_ARGS="--force --hostonly --omit 'systemd plymouth resume usrmount'"
+ # network configuration + # network configuration
+ if [ "$KDUMP_NETCONFIG" = "auto" ] ; then + if [ "$KDUMP_NETCONFIG" = "auto" ] ; then
+ status_message "Network: auto" + 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 + elif [ -z "$KDUMP_NETCONFIG" ] ; then
+ status_message "Network: none" + status_message "Network: none"
+ else + else
@ -32,8 +39,21 @@ Acked-by: Petr Tesarik <ptesarik@suse.cz>
+ status_message "Network mode: Automatic IP (DHCP)" + status_message "Network mode: Automatic IP (DHCP)"
+ DRACUT_ARGS+=" --kernel-cmdline 'rd.neednet=1 ip=${interface}:dhcp'" + DRACUT_ARGS+=" --kernel-cmdline 'rd.neednet=1 ip=${interface}:dhcp'"
+ fi + fi
+ modules="$modules network"
+ fi + fi
+ +
# add mount points # add mount points
kdump_get_mountpoints || return 1 kdump_get_mountpoints || return 1
i=0 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

18
kdump.changes
View File

@ -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 Fri Mar 14 11:03:35 UTC 2014 - ptesarik@suse.cz