Commit f2225a80 authored by Raphaël Hertzog's avatar Raphaël Hertzog
Browse files

Drop debian/patches/fix-win32-loader, merged in Debian. Only remaining change is the above one.

parent 5cf4f057
......@@ -3,6 +3,8 @@ live-build (3.0.5-1kali1) kali; urgency=low
* Ensure xfsprogs and jfsutils are available in the ISO. Otherwise users
opting for XFS and JFS and installing without network won't have them and
the (first) boot can be interrupted due to this.
* Drop debian/patches/fix-win32-loader, merged in Debian. Only remaining
change is the above one.
-- Raphaël Hertzog <hertzog@debian.org> Mon, 26 Aug 2013 18:38:06 +0200
......
Description: Fix generation of win32-loader.ini.
It was lacking proper entry of the GTK kernel/initrd due to a bad check.
And it was wrongly hardcoding the architecture in some keys.
--- 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
fix-win32-loader
add-xfsprogs-jfsutils-to-d-i.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment