Attachment #496911 for bug #769350

View | Details | Raw Unified | Return to bug 769350
Collapse All | Expand All




        }
    }

    my @confs = @{$files{Bootloader::Path::Grub2_conf()} || []};
    my @entries = ();
    my $conf_path = Bootloader::Path::Grub2_conf();
    if (-e $conf_path) {
        my @confs = @{$files{$conf_path} || []};
        foreach my $conf (@confs) {
            if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {
                push @entries, { "menuentry" =>  $1 };
            }
        }
    }





        \@defaultconf
    );

    my @confs = @{$files{Bootloader::Path::Grub2_eficonf()} || []};
    my @entries = ();
    my $conf_path = Bootloader::Path::Grub2_eficonf();
    if (-e $conf_path) {
        my @confs = @{$files{$conf_path} || []};
        foreach my $conf (@confs) {
            if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {
                push @entries, { "menuentry" =>  $1 };
            }
        }
    }


Return to bug 769350

Lines 468-478 sub ParseLines { Link Here

(-)perl-Bootloader-0.6.4/src/Core/GRUB2.pm (-4 / +7 lines)
468	}	468	}
469	}	469	}
470		470
471	my @confs = @{$files{Bootloader::Path::Grub2_conf()} \|\| []};
472	my @entries = ();	471	my @entries = ();
473	foreach my $conf (@confs) {	472	my $conf_path = Bootloader::Path::Grub2_conf();
474	if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {	473	if (-e $conf_path) {
475	push @entries, { "menuentry" => $1 };	474	my @confs = @{$files{$conf_path} \|\| []};
		475	foreach my $conf (@confs) {
		476	if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {
		477	push @entries, { "menuentry" => $1 };
		478	}
476	}	479	}
477	}	480	}
478		481

Lines 131-141 sub ParseLines { Link Here

(-)perl-Bootloader-0.6.4/src/Core/GRUB2EFI.pm (-4 / +7 lines)
131	\@defaultconf	131	\@defaultconf
132	);	132	);
133		133
134	my @confs = @{$files{Bootloader::Path::Grub2_eficonf()} \|\| []};
135	my @entries = ();	134	my @entries = ();
136	foreach my $conf (@confs) {	135	my $conf_path = Bootloader::Path::Grub2_eficonf();
137	if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {	136	if (-e $conf_path) {
138	push @entries, { "menuentry" => $1 };	137	my @confs = @{$files{$conf_path} \|\| []};
		138	foreach my $conf (@confs) {
		139	if ($conf =~ /^menuentry\s+['"](.*)['"]\s+/) {
		140	push @entries, { "menuentry" => $1 };
		141	}
139	}	142	}
140	}	143	}
141		144