Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix isolinux config parsing. Thanks to Philipp Hahn for the patch. 

Closes: #886655
This commit is contained in:
Steve McIntyre 2018-02-04 00:30:08 +00:00
parent afb059ca9b
commit 8714e849ad
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -9,6 +9,8 @@ debian-cd (3.1.21) UNRELEASED; urgency=medium
* Make update_popcon deal with https on popcon.d.o * Make update_popcon deal with https on popcon.d.o
* Depend on wget instead of just Recommending it. * Depend on wget instead of just Recommending it.
* Update references to point to salsa.d.o for git repo * Update references to point to salsa.d.o for git repo
* Fix isolinux config parsing. Thanks to Philipp Hahn for the
patch. Closes: #886655
[ JH Chatenet ] [ JH Chatenet ]
* Include debian-ports-archive-keyring on non released architectures * Include debian-ports-archive-keyring on non released architectures

2
tools/boot/buster/parse_isolinux
View File

@ -66,6 +66,8 @@ sub parse_file {
if ($in_ifcpu == 3) { if ($in_ifcpu == 3) {
parse_file($1); parse_file($1);
$in_ifcpu = 1; $in_ifcpu = 1;
} else {
push(@lines, $line);
} }
} elsif ($line =~ /append (.*)$/ && $in_ifcpu == 2) { } elsif ($line =~ /append (.*)$/ && $in_ifcpu == 2) {
# Parse out the first entry - that's what we want to use # Parse out the first entry - that's what we want to use

2
tools/boot/stretch/parse_isolinux
View File

@ -66,6 +66,8 @@ sub parse_file {
if ($in_ifcpu == 3) { if ($in_ifcpu == 3) {
parse_file($1); parse_file($1);
$in_ifcpu = 1; $in_ifcpu = 1;
} else {
push(@lines, $line);
} }
} elsif ($line =~ /append (.*)$/ && $in_ifcpu == 2) { } elsif ($line =~ /append (.*)$/ && $in_ifcpu == 2) {
# Parse out the first entry - that's what we want to use # Parse out the first entry - that's what we want to use