diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-07 15:11:20 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:21 +0100 |
| commit | 83bc63f725263c571094e3af1c88c58992bf0ac6 (patch) | |
| tree | 25be3b96127e122c9f1448f6155dea6b03293248 /scripts/build/binary_win32-loader | |
| parent | 293765885126c0fe429718f403be2802a225cd68 (diff) | |
| download | vyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.tar.gz vyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.zip | |
Updating internal variables from lh to lb scheme, should be the last piece to finish the live-helper to live-build rename.
Diffstat (limited to 'scripts/build/binary_win32-loader')
| -rwxr-xr-x | scripts/build/binary_win32-loader | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index 3a17dbdda..7eb86a69a 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -11,7 +11,7 @@ set -e # Including common functions -. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh +. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables DESCRIPTION="$(Echo 'copy win32-loader into binary')" @@ -24,7 +24,7 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -if [ "${LH_WIN32_LOADER}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] +if [ "${LB_WIN32_LOADER}" != "true" ] || [ "${LB_BINARY_IMAGES}" = "virtual-hdd" ] then exit 0 fi @@ -43,9 +43,9 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -case "${LH_ARCHITECTURE}" in +case "${LB_ARCHITECTURE}" in amd64|i386) - case "${LH_DISTRIBUTION}" in + case "${LB_DISTRIBUTION}" in lenny|squeeze) WIN32_LOADER="/usr/lib/win32-loader" ;; @@ -55,7 +55,7 @@ case "${LH_ARCHITECTURE}" in ;; esac - if [ "${LH_BUILD_WITH_CHROOT}" = "true" ] + if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Checking depends Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader @@ -79,12 +79,12 @@ case "${LH_ARCHITECTURE}" in mv binary/win32-loader-standalone.exe binary/setup-standalone.exe fi - if [ "${LH_DEBIAN_INSTALLER}" != "false" ] + if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then cat > binary/win32-loader.ini << EOF [installer] -arch=${LH_ARCHITECTURE} +arch=${LB_ARCHITECTURE} i386/linux=install/vmlinuz i386/initrd=install/initrd.gz i386/gtk/linux=install/vmlinuz |