Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
tails
live-build
Commits
f2225a80
Commit
f2225a80
authored
Aug 26, 2013
by
Raphaël Hertzog
Browse files
Drop debian/patches/fix-win32-loader, merged in Debian. Only remaining change is the above one.
parent
5cf4f057
Changes
3
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
f2225a80
...
...
@@ -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
...
...
debian/patches/fix-win32-loader
deleted
100644 → 0
View file @
5cf4f057
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
debian/patches/series
View file @
f2225a80
fix-win32-loader
add-xfsprogs-jfsutils-to-d-i.patch
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment