Fix win32-loader.
Raphaël Hertzog
11 years ago
|
0 |
live-build (3.0.1-1+kali1) kali; urgency=low
|
|
1 |
|
|
2 |
* Fix win32-loader.
|
|
3 |
|
|
4 |
-- Raphaël Hertzog <[email protected]> Thu, 07 Mar 2013 21:53:48 +0100
|
|
5 |
|
| 0 | 6 |
live-build (3.0.1-1) unstable; urgency=low
|
| 1 | 7 |
|
| 2 | 8 |
* Removing superfluous menu default directive in installer syslinux
|
|
0 |
Description: Fix generation of win32-loader.ini.
|
|
1 |
It was lacking proper entry of the GTK kernel/initrd due to a bad check.
|
|
2 |
And it was wrongly hardcoding the architecture in some keys.
|
|
3 |
--- a/scripts/build/binary_win32-loader
|
|
4 |
+++ b/scripts/build/binary_win32-loader
|
|
5 |
@@ -85,16 +85,16 @@ cat > binary/win32-loader.ini << EOF
|
|
6 |
kernel=linux
|
|
7 |
arch=${LB_ARCHITECTURES}
|
|
8 |
default_desktop=gnome
|
|
9 |
-i386/linux=install/vmlinuz
|
|
10 |
-i386/initrd=install/initrd.gz
|
|
11 |
+${LB_ARCHITECTURES}/linux=install/vmlinuz
|
|
12 |
+${LB_ARCHITECTURES}/initrd=install/initrd.gz
|
|
13 |
EOF
|
|
14 |
|
|
15 |
- if [ -e install/gtk ]
|
|
16 |
+ if [ -e binary/install/gtk ]
|
|
17 |
then
|
|
18 |
|
|
19 |
cat >> binary/win32-loader.ini << EOF
|
|
20 |
-i386/gtk/linux=install/vmlinuz
|
|
21 |
-i386/gtk/initrd=install/gtk/initrd.gz
|
|
22 |
+${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz
|
|
23 |
+${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz
|
|
24 |
EOF
|
|
25 |
|
|
26 |
fi
|