From 4d98e868789d968376aad07e5d255c7d5af417a3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 8 Apr 2015 05:51:57 -0400 Subject: split read_() out of read() needed for next commit --- perl-install/bootloader.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 45f10a721..d7bddcff2 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -258,6 +258,13 @@ sub read { } @devs; if ($type eq $main_method) { + return $bootloader if read_($bootloader); + } + } +} + +sub read_ { + my ($bootloader) = @_; my @prefered_entries = map { get_label($_, $bootloader) } $bootloader->{default}, 'linux'; if (my $default = find { $_ && $_->{type} eq 'image' } (@prefered_entries, @{$bootloader->{entries}})) { @@ -268,8 +275,6 @@ sub read { $bootloader->{default_options} = {}; } return $bootloader; - } - } } =item read_grub2 ($o_fstab) -- cgit v1.2.1