[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] Bug #45868 DVD: Fix isolinux.cfg parsing



Debian added Multi-Arch support to its CD images, where "label" and
"append" have to be special parsed to distinguish between "ifcpu64" and
normal "linux" statements.

That broke "append" parsing, as those lines were no longer passed on for
further procession:
> 162: foreach my $line(@lines) {
...
> 239    } elsif ($line =~ /append (.*)$/ && $in_kernel) {
> 240        $kernel{"append"} = $1;
no longer trigger.

Pass on the line if we are not in "ifcpu64==3" mode.
---
 tools/boot/stretch/parse_isolinux | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/boot/stretch/parse_isolinux b/tools/boot/stretch/parse_isolinux
index 5ed32cb..a15e52d 100755
--- a/tools/boot/stretch/parse_isolinux
+++ b/tools/boot/stretch/parse_isolinux
@@ -66,6 +66,8 @@ sub parse_file {
 	    if ($in_ifcpu == 3) {
 		parse_file($1);
 		$in_ifcpu = 1;
+	    } else {
+		push(@lines, $line);
 	    }
 	} elsif ($line =~ /append (.*)$/ && $in_ifcpu == 2) {
 	    # Parse out the first entry - that's what we want to use
-- 
2.11.0


Reply to: