Commit 72814819 authored by Tails developers's avatar Tails developers

Install amd64 kernel instead of 686-pae one: a 64-bit kernel will be required...

Install amd64 kernel instead of 686-pae one: a 64-bit kernel will be required for UEFI boot on 64-bit hardware.
parent ecf4f0ea
......@@ -47,7 +47,7 @@ hw_arch="`dpkg --print-architecture`"
if [ "$hw_arch" = i386 -o "$hw_arch" = amd64 ]; then
$RUN_LB_CONFIG \
--architecture i386 \
--linux-flavours "486 686-pae" \
--linux-flavours "486 amd64" \
${@}
# build powerpc images on powerpc64 as well, include only powerpc kernel
elif [ "$hw_arch" = powerpc -o "$hw_arch" = powerpc64 ]; then
......
......@@ -66,10 +66,10 @@ Remove_package
cat > "${SYSLINUX_CFG}" <<EOF
label select_menu
com32 ifcpu64.c32
append menu_686-pae -- menu_686-pae -- menu_486
label menu_686-pae
append menu_amd64 -- menu_amd64 -- menu_486
label menu_amd64
kernel vesamenu.c32
append live686.cfg
append liveamd64.cfg
label menu_486
kernel vesamenu.c32
append live486.cfg
......@@ -82,7 +82,7 @@ EOF
sed -i -e "1i prompt 0\ntimeout 40\n" "${SYSLINUX_MENU_CFG}"
# Copy and adapt live.cfg for each kernel
for arch in 486 686
for arch in 486 amd64
do
(
echo "include menu.cfg"
......@@ -93,7 +93,7 @@ do
append=2
fi
sed -e "s,/vmlinuz$,/vmlinuz${append}, ; s,initrd\.img,initrd${append}.img," "${SYSLINUX_LIVE_CFG}"
) | sed -n -e '/^label live-686-pae.*/ { q } ; p' \
) | sed -n -e '/^label live-amd64.*/ { q } ; p' \
> "${SYSLINUX_PATH}/live${arch}.cfg"
done
......
#!/bin/sh
running_pae_kernel() {
uname -r | grep -qs '686-pae$'
running_amd64_kernel() {
uname -r | grep -qs 'amd64$'
}
case "$1" in
kernel)
boot_kernel="$2"
if running_pae_kernel ; then
if running_amd64_kernel ; then
echo "$boot_kernel" | sed -e 's,/vmlinuz$,/vmlinuz2,'
else
echo "$boot_kernel"
......@@ -15,7 +15,7 @@ case "$1" in
;;
initrd)
boot_initrd="$2"
if running_pae_kernel ; then
if running_amd64_kernel ; then
echo "$boot_initrd" | sed -e 's,/initrd\.img$,/initrd2.img,'
else
echo "$boot_initrd"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment