From cafb5bef1054b7b4b41278bad353d0841e09e4ee Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 11:57:44 +0800 Subject: [PATCH 1/5] Put the dracut_args --omit back into /etc/kdump.conf --- xCAT/postscripts/enablekdump | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index 3a61bcfc0..6849ae13e 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -246,10 +246,8 @@ EOF echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf echo "default shell" >> /etc/kdump.conf - if (pmatch $OSVER "rhel7*") || (pmatch $OSVER "rhels7*");then - #strip "xcat" out of the initramfs for kdump - echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf - fi + #strip "xcat" out of the initramfs for kdump + echo "dracut_args --omit \"xcat\"" >> /etc/kdump.conf #strip the unnecessary kernel options from /proc/cmdline #the modified "cmdline" will be used as the kernel options #for kdump initramfs; otherwise, the "service kdump restart" will fail From b269c0067b58af0b67ba11c1429dbce6808b5bd2 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 14:06:18 +0800 Subject: [PATCH 2/5] Enlarge the recommended size for tmpfs file system used for kdump over ethernet --- .../manage_clusters/common/deployment/enable_kdump.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst index d3cc84a67..17b8ea5cb 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_kdump.rst @@ -57,11 +57,11 @@ The kdump will create a new initrd which used in the dumping stage. The ``/tmp`` * **[RHELS]** :: - tmpfs /var/tmp tmpfs defaults,size=200m 0 2 + tmpfs /var/tmp tmpfs defaults,size=500m 0 2 * **[SLES11]** :: - tmpfs /tmp tmpfs defaults,size=200m 0 2 + tmpfs /tmp tmpfs defaults,size=500m 0 2 * **[Ubuntu]** :: From 3640ce59e1def80b8a05a1b8d1516340cdd3d811 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 15:25:17 +0800 Subject: [PATCH 3/5] Copy file /etc/os-release for kdump over ethernet on RHEL 8 --- xCAT/postscripts/enablekdump | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index 6849ae13e..c8a749e27 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -244,6 +244,8 @@ EOF #with a dummy "proc" inside, which will fake "root=nfs:$KDIP:$KDPATH" as a valid root directory [ -e $MOUNTPATH/proc ] || echo "Dummy file: fake the /proc to pass the checking of 'root=' inside dracut-cmdline " > $MOUNTPATH/proc + [ -f /etc/os-release ] && mkdir $MOUNTPATH/etc && cp /etc/os-release $MOUNTPATH/etc/os-release + echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf echo "default shell" >> /etc/kdump.conf #strip "xcat" out of the initramfs for kdump From 25bd151335764a7b65b194d8c4a07a3d1c3a163f Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 17:01:06 +0800 Subject: [PATCH 4/5] Donot add kernel argument root= on RHEL 8 --- xCAT/postscripts/enablekdump | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index c8a749e27..af1d137b3 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -262,7 +262,9 @@ EOF fi done sed -i "s#^[\t ]*KDUMP_COMMANDLINE=\"#KDUMP_COMMANDLINE=\"$kdumpcmdline#" /etc/sysconfig/kdump - sed -i "s#^[\t ]*KDUMP_COMMANDLINE_APPEND=\"#KDUMP_COMMANDLINE_APPEND=\"root=nfs:$KDIP:$KDPATH #" /etc/sysconfig/kdump + if (pmatch $OSVER "rhel7*") || (pmatch $OSVER "rhels7*"); then + sed -i "s#^[\t ]*KDUMP_COMMANDLINE_APPEND=\"#KDUMP_COMMANDLINE_APPEND=\"root=nfs:$KDIP:$KDPATH #" /etc/sysconfig/kdump + fi [ -f /etc/dracut.conf ] && mv /etc/dracut.conf /tmp/dracut.conf restartservice kdump [ -f /tmp/dracut.conf ] && mv /tmp/dracut.conf /etc/dracut.conf From 6cb7aa0eb208e11763371068c275cbdea07e0fb8 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 28 Mar 2019 17:01:08 +0800 Subject: [PATCH 5/5] Revert "Copy file /etc/os-release for kdump over ethernet on RHEL 8" This reverts commit 3640ce59e1def80b8a05a1b8d1516340cdd3d811. --- xCAT/postscripts/enablekdump | 2 -- 1 file changed, 2 deletions(-) diff --git a/xCAT/postscripts/enablekdump b/xCAT/postscripts/enablekdump index af1d137b3..92fd65881 100755 --- a/xCAT/postscripts/enablekdump +++ b/xCAT/postscripts/enablekdump @@ -244,8 +244,6 @@ EOF #with a dummy "proc" inside, which will fake "root=nfs:$KDIP:$KDPATH" as a valid root directory [ -e $MOUNTPATH/proc ] || echo "Dummy file: fake the /proc to pass the checking of 'root=' inside dracut-cmdline " > $MOUNTPATH/proc - [ -f /etc/os-release ] && mkdir $MOUNTPATH/etc && cp /etc/os-release $MOUNTPATH/etc/os-release - echo "nfs $KDIP:$KDPATH" > /etc/kdump.conf echo "default shell" >> /etc/kdump.conf #strip "xcat" out of the initramfs for kdump