diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-04 20:36:20 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-04 20:36:20 +0200 |
| commit | cf68abf41709cf6c9d6f58aff34a7e218f368343 (patch) | |
| tree | 8a2ea537272af40964b2c8f1f009269c9c8430d8 /scripts/build | |
| parent | f93fa286d5e7348150aab4874794f7d96dac0894 (diff) | |
| download | vyos-live-build-cf68abf41709cf6c9d6f58aff34a7e218f368343.tar.gz vyos-live-build-cf68abf41709cf6c9d6f58aff34a7e218f368343.zip | |
Renaming grub helper to grub-legacy for consistency.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/binary_grub-legacy (renamed from scripts/build/binary_grub) | 22 | ||||
| -rwxr-xr-x | scripts/build/config | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub-legacy index ed29417b5..54431a79e 100755 --- a/scripts/build/binary_grub +++ b/scripts/build/binary_grub-legacy @@ -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 diff --git a/scripts/build/config b/scripts/build/config index 74eb6ae43..8e2109594 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -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\ |