diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-08 05:51:57 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-08 05:53:09 -0400 |
| commit | 4d98e868789d968376aad07e5d255c7d5af417a3 (patch) | |
| tree | fef4f20949376319f6c08fc41264be9e3cbd7c53 /perl-install | |
| parent | 7b4f7c843f39984d814ccd6d4f4709ae7f4d6c38 (diff) | |
| download | drakx-4d98e868789d968376aad07e5d255c7d5af417a3.tar drakx-4d98e868789d968376aad07e5d255c7d5af417a3.tar.gz drakx-4d98e868789d968376aad07e5d255c7d5af417a3.tar.bz2 drakx-4d98e868789d968376aad07e5d255c7d5af417a3.tar.xz drakx-4d98e868789d968376aad07e5d255c7d5af417a3.zip | |
split read_() out of read()
needed for next commit
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/bootloader.pm | 9 |
1 files changed, 7 insertions, 2 deletions
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) |