Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 370207 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/sys-apps/kexec-tools/files/kexec.init (-7 / +20 lines)
Lines 8-16 Link Here
8
}
8
}
9
9
10
image_path() {
10
image_path() {
11
	local x= kver=$(uname -r)
11
	local x= kver=$(uname -r) karch=$(uname -m)
12
	for x in "${KNAME:-bzImage}" vmlinuz \
12
	for x in "${KNAME:-bzImage}" vmlinuz \
13
		bzImage-"${kver}" vmlinuz-"${kver}" ; do
13
		bzImage-"${kver}" vmlinuz-"${kver}" \
14
		kernel-genkernel-"${karch}"-"${kver}"; do
15
		if [ -e "${BOOTPART}/${x}" ] ; then
16
			echo "${BOOTPART}/${x}"
17
			return 0
18
		fi
19
	done
20
21
	return 1
22
}
23
24
initrd_path() {
25
	local x= kver=$(uname -r) karch=$(uname -m)
26
	for x in "${INITRD:-initrd}" \
27
		initrd-"${kver}" initramfs-"${kver}" \
28
		initramfs-genkernel-"${karch}"-"${kver}"; do
14
		if [ -e "${BOOTPART}/${x}" ] ; then
29
		if [ -e "${BOOTPART}/${x}" ] ; then
15
			echo "${BOOTPART}/${x}"
30
			echo "${BOOTPART}/${x}"
16
			return 0
31
			return 0
Lines 56-66 Link Here
56
	fi
71
	fi
57
72
58
	# Use the default initrd if it exists and none other given
73
	# Use the default initrd if it exists and none other given
59
	if  [ -z "${INITRD}" -a -e "${BOOTPART}"/initrd ] ; then
74
	initrd="$(initrd_path)"
60
	    INITRD="${BOOTPART}/initrd"
75
	if [ -n "${initrd}" -a -e "${initrd}" ] ; then
61
	fi
76
	    initrdopt="--initrd=${initrd}"
62
	if [ -e "${INITRD}" ] ; then
63
	    initrdopt="--initrd=${INITRD}"
64
	fi
77
	fi
65
78
66
	kexec -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
79
	kexec -l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}

Return to bug 370207