Commit f93fa286 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Renaming grub2 helper to grub-pc for later grub-efi addition.

parent ffb463f7
......@@ -61,7 +61,7 @@ lb binary_package-lists ${@}
lb binary_linux-image ${@}
lb binary_memtest ${@}
lb binary_grub ${@}
lb binary_grub2 ${@}
lb binary_grub-pc ${@}
lb binary_syslinux ${@}
lb binary_disk ${@}
lb binary_loadlin ${@}
......
......@@ -14,7 +14,7 @@ set -e
[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
# Setting static variables
DESCRIPTION="$(Echo 'installs grub2 into binary')"
DESCRIPTION="$(Echo 'installs grub-pc into binary')"
HELP=""
USAGE="${PROGRAM} [--force]"
......@@ -24,12 +24,12 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LB_BOOTLOADER}" != "grub2" ]
if [ "${LB_BOOTLOADER}" != "grub-pc" ]
then
exit 0
fi
Echo_message "Begin installing grub2..."
Echo_message "Begin installing grub-pc..."
# Requiring stage file
Require_stagefile .build/config .build/bootstrap
......@@ -37,8 +37,8 @@ Require_stagefile .build/config .build/bootstrap
# Checking stage file
Check_stagefile .build/binary_grub
# Checking grub2 templates
Check_templates grub2
# Checking grub-pc templates
Check_templates grub-pc
# Checking lock file
Check_lockfile .lock
......@@ -91,17 +91,17 @@ Grub_install_entry ()
LINUX_INSTALL="${LINUX_INSTALL}\n}"
}
if [ -e "config/bootloaders/grub2" ]
if [ -e "config/bootloaders/grub-pc" ]
then
# Internal local copy
_SOURCE="config/bootloaders/grub2"
_SOURCE="config/bootloaders/grub-pc"
else
# Internal system copy
if [ -n "${LIVE_BUILD}" ]
then
_SOURCE="${LIVE_BUILD}/share/bootloaders/grub2"
_SOURCE="${LIVE_BUILD}/share/bootloaders/grub-pc"
else
_SOURCE="/usr/share/live/build/bootloaders/grub2"
_SOURCE="/usr/share/live/build/bootloaders/grub-pc"
fi
fi
......
......@@ -115,7 +115,7 @@ case "${LB_BOOTLOADER}" in
XORRISO_EXCLUDE="boot/grub/stage2_eltorito"
;;
grub2)
grub-pc)
XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/grub_eltorito -J"
XORRISO_EXCLUDE="boot/grub/grub_eltorito"
......@@ -149,7 +149,7 @@ esac
# XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"
#fi
if [ "${LB_BOOTLOADER}" = "grub2" ]
if [ "${LB_BOOTLOADER}" = "grub-pc" ]
then
cat > binary.sh << EOF
......
......@@ -32,7 +32,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
\t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
\t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\
\t [--bootloader grub|grub2|syslinux]\n\
\t [--bootloader grub|grub-pc|syslinux]\n\
\t [--cache true|false]\n\
\t [--cache-indices true|false]\n\
\t [--cache-packages true|false]\n\
......
Supports Markdown
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