summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRaphaƫl Hertzog <hertzog@debian.org>2013-03-07 22:04:24 +0100
committerDaniel Baumann <daniel@debian.org>2013-04-09 05:52:09 +0200
commit13bfa69cbfc448a8c33b3e15825d1391bb12310e (patch)
treef01bfc5ac73bf22439a23b33ef72a2fafd96324e /scripts
parentc366502ec14beee3b067786bd32a56c9f7b38b11 (diff)
downloadvyos-live-build-13bfa69cbfc448a8c33b3e15825d1391bb12310e.tar.gz
vyos-live-build-13bfa69cbfc448a8c33b3e15825d1391bb12310e.zip
Fixing win32-loader.ini by including the GTK related entries.
The check protecting their addition was wrong. Also fix the actual keys with the correct architecture instead of hardcoding i386.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build/binary_win32-loader10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
index 267abcb1a..a46e06213 100755
--- a/scripts/build/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -85,16 +85,16 @@ cat > binary/win32-loader.ini << EOF
kernel=linux
arch=${LB_ARCHITECTURES}
default_desktop=gnome
-i386/linux=install/vmlinuz
-i386/initrd=install/initrd.gz
+${LB_ARCHITECTURES}/linux=install/vmlinuz
+${LB_ARCHITECTURES}/initrd=install/initrd.gz
EOF
- if [ -e install/gtk ]
+ if [ -e binary/install/gtk ]
then
cat >> binary/win32-loader.ini << EOF
-i386/gtk/linux=install/vmlinuz
-i386/gtk/initrd=install/gtk/initrd.gz
+${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz
+${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz
EOF
fi