summaryrefslogtreecommitdiff
path: root/scripts/build/binary_win32-loader
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-04-01 10:58:47 +0100
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 15:54:19 +0200
commit6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch)
treec91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build/binary_win32-loader
parent6def2c27be28169cf3e0757a6928e3f13de157a8 (diff)
downloadvyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz
vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1 to keep the renaming simple, but leaving the variable plural is a cause for confusion. since this property is stored in the INI style config/build config file rather than a shell script based one, at the property there is already singular, there was no need for a backwards compatibility hack. Gbp-Dch: Short
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 16d81bc10..9dba191b6 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -39,7 +39,7 @@ Acquire_lockfile
RUN_LABEL="Run Debian GNU/Linux"
-case "${LB_ARCHITECTURES}" in
+case "${LB_ARCHITECTURE}" in
amd64|i386)
# Checking depends
Check_package chroot /usr/share/win32/win32-loader.exe win32-loader
@@ -80,18 +80,18 @@ EOF
cat > binary/win32-loader.ini << EOF
[installer]
kernel=linux
-arch=${LB_ARCHITECTURES}
+arch=${LB_ARCHITECTURE}
default_desktop=gnome
-${LB_ARCHITECTURES}/linux=install/vmlinuz
-${LB_ARCHITECTURES}/initrd=install/initrd.gz
+${LB_ARCHITECTURE}/linux=install/vmlinuz
+${LB_ARCHITECTURE}/initrd=install/initrd.gz
EOF
if [ -e binary/install/gtk ]
then
cat >> binary/win32-loader.ini << EOF
-${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz
-${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz
+${LB_ARCHITECTURE}/gtk/linux=install/vmlinuz
+${LB_ARCHITECTURE}/gtk/initrd=install/gtk/initrd.gz
EOF
fi