mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 09:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

kdump: don't set default values for KDUMP_CMDLINE and KDUMP_KIMAGE

Browse Source 
Do not set default values of KDUMP_CMDLINE and KDUMP_KIMAGE, and leave
them set by configure file since they are different for different
architectures. Take KDUMP_KIMAGE kdump kernel image for example:

    x86 is bzImage
    mips64 is vmlinux
    ppc is uImage
    arm is zImage

(From OE-Core rev: 05dcb054fcd0c80bb09612c3e15b6b1f0487aae8)

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Roy Li
2016-07-22 14:45:10 +08:00
committed by Richard Purdie
parent 9b8b730d24
commit ab075b6fb8
2 changed files with 18 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
meta/recipes-kernel/kexec/kexec-tools/kdump
View File

@@ -8,23 +8,7 @@
# #
#default #default
KDUMP_KVER="`uname -r`" KEXEC=/usr/sbin/kexec
KDUMP_KIMAGE="/boot/bzImage-${KDUMP_KVER}"
KDUMP_CMDLINE="`cat /proc/cmdline`"
KDUMP_CMDLINE_APPEND="kdump_needed maxcpus=1 irqpoll reset_devices"
KDUMP_VMCORE_PATH="/var/crash/`date +"%Y-%m-%d"`"
#get right kernel image
march="`uname -m`"
case ${march} in
x86*|i?86)
;;
*)
KDUMP_KIMAGE="/boot/uImage-${KDUMP_KVER}"
;;
esac
KEXEC=usr/sbin/kexec
KEXEC_ARGS="-p" KEXEC_ARGS="-p"
MAKEDUMPFILE=/usr/bin/makedumpfile MAKEDUMPFILE=/usr/bin/makedumpfile
@@ -34,6 +18,9 @@ LOGGER="logger -p info -t kdump"
if [ -f /etc/sysconfig/kdump.conf ]; then if [ -f /etc/sysconfig/kdump.conf ]; then
. /etc/sysconfig/kdump.conf . /etc/sysconfig/kdump.conf
else
echo "no /etc/sysconfig/kdump.conf"
exit 1;
fi fi
do_check() do_check()
@@ -41,24 +28,33 @@ do_check()
#check makedumpfile #check makedumpfile
if [ ! -e ${MAKEDUMPFILE} -o ! -x ${MAKEDUMPFILE} ] ;then if [ ! -e ${MAKEDUMPFILE} -o ! -x ${MAKEDUMPFILE} ] ;then
echo "No makedumpfile found." echo "No makedumpfile found."
return 1; exit 0
fi fi
#check kexec #check kexec
if [ ! -e ${KEXEC} -o ! -x ${KEXEC} ] ;then if [ ! -e ${KEXEC} -o ! -x ${KEXEC} ] ;then
echo "No kexec found." echo "No kexec found."
return 1; exit 0
fi fi
#check whether kdump kernel image exists on the system #check whether kdump kernel image exists on the system
if [ ! -f ${KDUMP_KIMAGE} ]; then if [ -z "${KDUMP_KIMAGE}" -o ! -f "${KDUMP_KIMAGE}" ]; then
echo "No kdump kernel image found." echo "No kdump kernel image found."
return 1 exit 0
fi
if [ "${KDUMP_CMDLINE}"x = "x" ] ; then
echo "KDUMP_CMDLINE is not configured"
exit 0
fi fi
} }
do_save_vmcore() do_save_vmcore()
{ {
if [ ${KDUMP_VMCORE_PATH}x = x ]; then
KDUMP_VMCORE_PATH="/var/crash/`date +"%Y-%m-%d"`"
fi
mkdir -p ${KDUMP_VMCORE_PATH} mkdir -p ${KDUMP_VMCORE_PATH}
echo "Saving a vmcore to ${KDUMP_VMCORE_PATH}." echo "Saving a vmcore to ${KDUMP_VMCORE_PATH}."
@@ -101,20 +97,6 @@ do_start()
return 1 return 1
fi fi
#handle kdump cmdline parameters, remove some useless options
kcmdline=""
for x in `cat /proc/cmdline`; do
case $x in
crashkernel*)
;;
*)
kcmdline="${kcmdline} $x"
;;
esac
done
KDUMP_CMDLINE="${kcmdline} ${KDUMP_CMDLINE_APPEND}"
#Load the kdump kernel image #Load the kdump kernel image
${KEXEC} ${KEXEC_ARGS} "${KDUMP_KIMAGE}" --append="${KDUMP_CMDLINE}" ${KEXEC} ${KEXEC_ARGS} "${KDUMP_KIMAGE}" --append="${KDUMP_CMDLINE}"
if [ $? != 0 ]; then if [ $? != 0 ]; then

6
meta/recipes-kernel/kexec/kexec-tools/kdump.conf
View File

@@ -1,13 +1,9 @@
#the kdump kernel version string. #the kdump kernel version string.
#KDUMP_KVER="`uname -r`" #KDUMP_KVER="`uname -r`"
#this will be passed to the kdump kernel as kdump kernel command line, it #this will be passed to the kdump kernel as kdump kernel command line
#usually comes from /proc/cmdline
#KDUMP_CMDLINE="`cat /proc/cmdline`" #KDUMP_CMDLINE="`cat /proc/cmdline`"
# append arguments to the kdump commandline
#KDUMP_CMDLINE_APPEND="kdump_needed maxcpus=1 irqpoll reset_devices"
#the kernel image for kdump #the kernel image for kdump
#KDUMP_KIMAGE="/boot/bzImage-${KDUMP_KVER}" #KDUMP_KIMAGE="/boot/bzImage-${KDUMP_KVER}"