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

Bug#886655: debian-cd: Fails to add EFI Grub menu entries when append gets too long or so



Control: tag 886655 patch

Hi everyone,

I just found the same problem reported and solved in another mail here
(<65b7a7928c7ef2da0ebc597643a3ca5dcfc4d098.1513345492.git.hahn@univention.de>,
 https://lists.debian.org/debian-cd/2017/12/msg00018.html):

> 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

Regards,
-- 
Moritz Schlarb
Unix-Gruppe | Systembetreuung
Zentrum für Datenverarbeitung
Johannes Gutenberg-Universität Mainz
Raum 01-331 - Tel. +49 6131 39-29441
OpenPGP Fingerprint: DF01 2247 BFC6
5501 AFF2 8445 0C24 B841 C7DD BAAF
begin:vcard
fn:Moritz Schlarb
n:Schlarb;Moritz
org;quoted-printable;quoted-printable:Johannes Gutenberg-Universit=C3=A4t Mainz;Zentrum f=C3=BCr Datenverarbeitung
adr;dom:;;;Mainz
email;internet:schlarbm@uni-mainz.de
tel;work:+49 6131 39 29441
note;quoted-printable:OpenPGP Fingerprint: DF01 2247 BFC6=0D=0A=
	5501 AFF2 8445 0C24 B841 C7DD BAAF
version:2.1
end:vcard

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: