manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding syslinux hardcoded default label entries.

This commit is contained in:
Daniel Baumann 2009-11-15 15:36:20 +01:00
parent 18afcd29eb
commit 91b9dab637
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
helpers/lh_binary_syslinux
View File

@ -101,8 +101,15 @@ Syslinux_live_entry ()
fi
# Note: ISOLINUX will not find the kernel if the name ends in ".img".
mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${NUMBER}
mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${NUMBER}.img
if [ -e ${KERNEL_PATH}/${KERNEL} ]
then
mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${NUMBER}
fi
if [ -e ${KERNEL_PATH}/${INITRD} ]
then
mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${NUMBER}.img
fi
KERNEL=vmlinuz${NUMBER}
INITRD=initrd${NUMBER}.img
@ -113,7 +120,11 @@ Syslinux_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}\n"
# Write the menu label if the syslinux menu is being use
LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL}\n"
if [ -n "${MENULABEL}" ]
then
LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL}\n"
fi
LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
@ -121,7 +132,11 @@ Syslinux_live_entry ()
LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n"
# Write the menu label if the syslinux menu is being use
LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL} (failsafe)\n"
if [ -n "${MENULABEL}" ]
then
LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL} (failsafe)\n"
fi
LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
}
@ -575,6 +590,9 @@ then
done
fi
# Adding syslinux hardcoded default label entry
Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
# Assembling debian-installer configuration
if [ "${LH_DEBIAN_INSTALLER}" != "disabled" ]
then