summaryrefslogtreecommitdiff
path: root/scripts/build/binary_win32-loader
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:39:58 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:39:58 +0100
commit1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034 (patch)
treeb98ff62505af2e1d3b2e0e394ffb92f81239cfec /scripts/build/binary_win32-loader
parent7b6dfd9d167b5ef09c6c1812f17e6df302f45897 (diff)
downloadvyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.tar.gz
vyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.zip
Cleaning up from python removal (LIVE_IMAGE_ARCHITECTURE).
Diffstat (limited to 'scripts/build/binary_win32-loader')
-rwxr-xr-xscripts/build/binary_win32-loader12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index e93e31a60..401144687 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -43,7 +43,7 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-case "${LIVE_IMAGE_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
amd64|i386)
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then
@@ -77,18 +77,18 @@ EOF
cat > binary/win32-loader.ini << EOF
[installer]
kernel=linux
-arch=${LIVE_IMAGE_ARCHITECTURE}
+arch=${LB_ARCHITECTURES}
default_desktop=gnome
-${LIVE_IMAGE_ARCHITECTURE}/linux=install/vmlinuz
-${LIVE_IMAGE_ARCHITECTURE}/initrd=install/initrd.gz
+${LB_ARCHITECTURES}/linux=install/vmlinuz
+${LB_ARCHITECTURES}/initrd=install/initrd.gz
EOF
if [ -e binary/install/gtk ]
then
cat >> binary/win32-loader.ini << EOF
-${LIVE_IMAGE_ARCHITECTURE}/gtk/linux=install/vmlinuz
-${LIVE_IMAGE_ARCHITECTURE}/gtk/initrd=install/gtk/initrd.gz
+${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz
+${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz
EOF
fi