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

Renaming grub helper to grub-legacy for consistency.

parent f93fa286
......@@ -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 grub into binary')"
DESCRIPTION="$(Echo 'installs grub-legacy into binary')"
HELP=""
USAGE="${PROGRAM} [--force]"
......@@ -24,21 +24,21 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
if [ "${LB_BOOTLOADER}" != "grub" ]
if [ "${LB_BOOTLOADER}" != "grub-legacy" ]
then
exit 0
fi
Echo_message "Begin installing grub..."
Echo_message "Begin installing grub-legacy..."
# Requiring stage file
Require_stagefile .build/config .build/bootstrap
# Checking stage file
Check_stagefile .build/binary_grub
Check_stagefile .build/binary_grub-legacy
# Checking grub templates
Check_templates grub
# Checking grub-legacy templates
Check_templates grub-legacy
# Checking lock file
Check_lockfile .lock
......@@ -117,17 +117,17 @@ Grub_install_entry ()
done
}
if [ -e "config/bootloaders/grub" ]
if [ -e "config/bootloaders/grub-legacy" ]
then
# Internal local copy
_SOURCE="config/bootloaders/grub"
_SOURCE="config/bootloaders/grub-legacy"
else
# Internal system copy
if [ -n "${LIVE_BUILD}" ]
then
_SOURCE="${LIVE_BUILD}/share/bootloaders/grub"
_SOURCE="${LIVE_BUILD}/share/bootloaders/grub-legacy"
else
_SOURCE="/usr/share/live/build/bootloaders/grub"
_SOURCE="/usr/share/live/build/bootloaders/grub-legacy"
fi
fi
......@@ -177,7 +177,7 @@ fi
if [ -n "${LB_NET_COW_PATH}" ]
then
Echo_error "Net cow not yet supported on grub"
Echo_error "Net cow not yet supported on grub-legacy"
exit 1
fi
......
......@@ -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|grub-pc|syslinux]\n\
\t [--bootloader grub-legacy|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