binary_loopback_cfg now renders grub.cfg by default.
The binary parts of grub-pc are left for the original binary_grub-pc. As a consequence both /boot/grub/grub.cfg and /boot/grub/loopback.cfg files will be present in any Debian Live CD. This might be useful to be reused from binary_grub-* bootloaders.
This commit is contained in:
Adrian Gibanel Lopez
parent
9d1a983cc8
commit
c4327f6138
|
|
@ -53,52 +53,6 @@ Restore_cache cache/packages.binary
|
|||
# Installing depends
|
||||
Install_package
|
||||
|
||||
# Local functions
|
||||
Grub_live_entry ()
|
||||
{
|
||||
LABEL="${1}"
|
||||
KERNEL="${2}"
|
||||
INITRD="${3}"
|
||||
APPEND="${4}"
|
||||
|
||||
LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
|
||||
LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} ${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}"
|
||||
LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
|
||||
LINUX_LIVE="${LINUX_LIVE}\n}"
|
||||
}
|
||||
|
||||
Grub_install_entry ()
|
||||
{
|
||||
LABEL="${1}"
|
||||
KERNEL="${2}"
|
||||
INITRD="${3}"
|
||||
APPEND="${4}"
|
||||
|
||||
if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
|
||||
then
|
||||
APPEND="${APPEND} quiet"
|
||||
fi
|
||||
|
||||
LINUX_INSTALL="${LINUX_INSTALL}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
|
||||
LINUX_INSTALL="${LINUX_INSTALL}\nlinux\t\t/${KERNEL} ${APPEND} LB_BOOTAPPEND_INSTALL"
|
||||
LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
|
||||
LINUX_INSTALL="${LINUX_INSTALL}\n}"
|
||||
}
|
||||
|
||||
if [ -e "config/bootloaders/grub-pc" ]
|
||||
then
|
||||
# Internal local copy
|
||||
_SOURCE="config/bootloaders/grub-pc"
|
||||
else
|
||||
# Internal system copy
|
||||
if [ -n "${LIVE_BUILD}" ]
|
||||
then
|
||||
_SOURCE="${LIVE_BUILD}/share/bootloaders/grub-pc"
|
||||
else
|
||||
_SOURCE="/usr/share/live/build/bootloaders/grub-pc"
|
||||
fi
|
||||
fi
|
||||
|
||||
case "${LB_INITRAMFS}" in
|
||||
live-boot)
|
||||
INITFS="live"
|
||||
|
|
@ -134,84 +88,8 @@ esac
|
|||
|
||||
Check_multiarchitectures
|
||||
|
||||
# Creating directory
|
||||
mkdir -p "${DESTDIR_LIVE}"
|
||||
|
||||
# Setting boot parameters
|
||||
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
|
||||
then
|
||||
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"
|
||||
fi
|
||||
|
||||
if [ -n "${LB_NET_COW_PATH}" ]
|
||||
then
|
||||
Echo_error "Net cow not yet supported on grub"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')"
|
||||
|
||||
# Assembling kernel configuration
|
||||
|
||||
# Default entries
|
||||
DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')"
|
||||
DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
|
||||
DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
|
||||
|
||||
Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}"
|
||||
|
||||
if [ "${LB_BOOTAPPEND_FAILSAFE}" != "none" ]
|
||||
then
|
||||
Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${LB_BOOTAPPEND_FAILSAFE}"
|
||||
fi
|
||||
|
||||
for KERNEL in chroot/boot/vmlinuz-*
|
||||
do
|
||||
VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
|
||||
|
||||
Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}"
|
||||
Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${LB_BOOTAPPEND_FAILSAFE}"
|
||||
done
|
||||
|
||||
LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
|
||||
|
||||
# Assembling debian-installer configuration
|
||||
if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
|
||||
then
|
||||
LINUX_LIVE="#\t \"Live\"\n${LINUX_LIVE}"
|
||||
LINUX_INSTALL="#\t \"Installer\"\n"
|
||||
|
||||
VMLINUZ_DI="install/vmlinuz"
|
||||
INITRD_DI="install/initrd.gz"
|
||||
APPEND_DI="vga=normal"
|
||||
|
||||
VMLINUZ_GI="install/gtk/vmlinuz"
|
||||
INITRD_GI="install/gtk/initrd.gz"
|
||||
APPEND_GI="video=vesa:ywrap,mtrr vga=788"
|
||||
|
||||
Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
|
||||
Grub_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
|
||||
Grub_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
|
||||
Grub_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
|
||||
Grub_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
|
||||
Grub_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
|
||||
Grub_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
|
||||
Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
|
||||
fi
|
||||
|
||||
LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
|
||||
|
||||
# Assembling memtest configuration
|
||||
if [ -f "${DESTDIR_LIVE}"/memtest ]
|
||||
then
|
||||
MEMTEST="#\t \"Other\"\n"
|
||||
MEMTEST="${MEMTEST}\nmenuentry\t\"${LB_MEMTEST}\" {\nlinux16\t$(basename ${DESTDIR_LIVE})/memtest\n}"
|
||||
MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
|
||||
fi
|
||||
|
||||
# Copying templates
|
||||
mkdir -p binary/boot/grub/i386-pc
|
||||
cp -r "${_SOURCE}"/* binary/boot/grub
|
||||
|
||||
case ${LIVE_IMAGE_TYPE} in
|
||||
iso*)
|
||||
|
|
@ -228,14 +106,11 @@ then
|
|||
FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
|
||||
fi
|
||||
|
||||
# We rely on: binary_loopback_cfg to generate grub.cfg and other configuration files
|
||||
|
||||
# Copying grub
|
||||
cp ${FILES} binary/boot/grub/i386-pc
|
||||
|
||||
sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/grub.cfg
|
||||
sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/grub.cfg
|
||||
|
||||
sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg
|
||||
|
||||
# Saving cache
|
||||
Save_cache cache/packages.binary
|
||||
|
||||
|
|
|
|||
|
|
@ -330,12 +330,14 @@ fi
|
|||
|
||||
# Copying templates
|
||||
mkdir -p binary/boot/grub
|
||||
cp "${_SOURCE}"/grub.cfg binary/boot/grub/loopback.cfg
|
||||
cp "${_SOURCE}"/grub.cfg binary/boot/grub/grub.cfg
|
||||
|
||||
sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL||" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/loopback.cfg
|
||||
sed -i -e "s#LB_BOOTAPPEND_INSTALL##" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/loopback.cfg
|
||||
sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL||" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/grub.cfg
|
||||
sed -i -e "s#LB_BOOTAPPEND_INSTALL##" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/boot/grub/grub.cfg
|
||||
|
||||
sed -i -e 's|\ $||g' binary/boot/grub/loopback.cfg
|
||||
sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg
|
||||
|
||||
echo "source /boot/grub/grub.cfg" > binary/boot/grub/loopback.cfg
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile .build/binary_loopback_cfg
|
||||
|
|
|
|||
Loading…
Reference in New Issue