Mageia Bugzilla – Attachment 5936 Details for
Bug 15153
Patches to add support for the rEFInd boot manager in drakboot
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
add refind support
refind.diff (text/plain), 5.75 KB, created by
Thierry Vignaud
on 2015-02-21 18:13:06 CET
(
hide
)
Description:
add refind support
Filename:
MIME Type:
Creator:
Thierry Vignaud
Created:
2015-02-21 18:13:06 CET
Size:
5.75 KB
patch
obsolete
>diff --git a/perl-install/any.pm b/perl-install/any.pm >index fd80a46..795e281 100644 >--- a/perl-install/any.pm >+++ b/perl-install/any.pm >@@ -502,6 +502,12 @@ sub setupBootloader__entries { > { label => N("Initrd"), val => \$e->{initrd}, list => [ map { if_(/^initrd/, "/boot/$_") } all("$::prefix/boot") ], not_edit => 0, advanced => 1 }, > { label => N("Network profile"), val => \$netprofile, list => [ sort(uniq('', $netprofile, network::network::netprofile_list())) ], advanced => 1 }, > ); >+ } elsif ($b->{method} eq 'refind') { >+ @l = ( >+ { label => N("Append"), val => \$append }, >+ { label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ], >+ format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 }, >+ ); > } else { > @l = ( > { label => N("Root"), val => \$e->{kernel_or_dev}, list => [ map { "/dev/$_->{device}" } @$fstab, detect_devices::floppies() ] }, >@@ -538,9 +544,15 @@ sub setupBootloader__entries { > my $Add = sub { > my @labels = map { $_->{label} } @{$b->{entries}}; > my ($e, $prefix); >- if ($in->ask_from_list_('', N("Which type of entry do you want to add?"), >- [ N_("Linux"), N_("Other OS (Windows...)") ] >- ) eq "Linux") { >+ if ($b->{method} eq 'refind') { >+ $e = { type => 'image', >+ kernel_or_dev => '/boot/vmlinuz', >+ root => '/dev/' . fs::get::root($fstab)->{device}, #- assume a good default. >+ }; >+ $prefix = "linux"; >+ } elsif ($in->ask_from_list_('', N("Which type of entry do you want to add?"), >+ [ N_("Linux"), N_("Other OS (Windows...)") ] >+ ) eq "Linux") { > $e = { type => 'image', > root => '/dev/' . fs::get::root($fstab)->{device}, #- assume a good default. > }; >@@ -586,6 +598,18 @@ sub setupBootloader__entries { > }; > > my @prev_entries = @{$b->{entries}}; >+ >+ #- the rEFInd configuration file just provides alternative kernel command lines >+ #- so we only want to display entries that relate to the default kernel. >+ if ($b->{method} eq 'refind') { >+ @{$b->{entries}} = >+ grep { >+ my $pb = $_->{type} ne 'image' || $_->{kernel_or_dev} ne '/boot/vmlinuz'; >+ log::l("dropping bootloader entry $_->{label} because it is not needed by rEFInd") if $pb; >+ !$pb; >+ } @{$b->{entries}}; >+ } >+ > if ($in->ask_from__add_modify_remove(N("Bootloader Configuration"), > N("Here are the entries on your boot menu so far. > You can create additional entries or change the existing ones."), [ { >diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm >index 9e75166..6fc525d 100644 >--- a/perl-install/bootloader.pm >+++ b/perl-install/bootloader.pm >@@ -251,6 +251,8 @@ sub read { > } elsif (my $type = partition_table::raw::typeOfMBR($_)) { > warn "typeOfMBR $type on $_ for method $main_method\n" if $ENV{DEBUG}; > $type; >+ } elsif (-e "/boot/EFI/EFI/refind" && -e "$::prefix/boot/refind_linux.conf") { >+ 'refind'; > } else { () } > } @devs; > >@@ -511,6 +513,36 @@ sub read_grub_menu_lst { > \%b; > } > >+=item read_refind ($fstab) >+ >+Read back rEFInd config + C</boot/refind_linux.conf> >+ >+=cut >+ >+sub read_refind() { >+ my (%bootloader, $entry); >+ $bootloader{entries} = []; >+ foreach (cat_utf8("$::prefix/boot/refind_linux.conf")) { >+ next if /^#/; >+ my ($label, $append) = /"(.*)"\s"(.*)"/; >+ my $root = $1 if $append =~ s/root=(\S*)\s*//; >+ my $vga = $1 if $append =~ s/vga=(\S*)\s*//; >+ if ($label && $root) { >+ push @{$bootloader{entries}}, { >+ type => 'image', >+ kernel_or_dev => '/boot/vmlinuz', >+ label => $label, >+ root => $root, >+ append => $append, >+ vga => $vga >+ }; >+ } >+ } >+ >+ $bootloader{method} = 'refind'; >+ \%bootloader; >+} >+ > # FIXME: actually read back previous conf > sub read_pmon2000() { > +{ method => 'pmon2000' }; >@@ -1245,6 +1277,7 @@ sub method2text { > 'grub2' => N("GRUB2 with graphical menu"), > 'grub-graphic' => N("GRUB with graphical menu"), > 'grub-menu' => N("GRUB with text menu"), >+ 'refind' => N("rEFInd"), > }->{$method}; > } > >@@ -1255,12 +1288,15 @@ sub method_choices_raw { > arch() =~ /arm/ ? 'uboot' : > if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix), > 'grub2'), >- if_(!is_uefi(), ( >+ is_uefi() ? >+ if_(!$b_prefix_mounted || -e "/boot/EFI/EFI/refind", >+ 'refind') >+ : ( > if_(!$b_prefix_mounted || whereis_binary('grub', $::prefix), > 'grub-graphic', 'grub-menu'), > if_(!$b_prefix_mounted || whereis_binary('lilo', $::prefix), > 'lilo-menu'), >- )); >+ ); > } > sub method_choices { > my ($all_hds, $b_prefix_mounted) = @_; >@@ -2017,6 +2053,42 @@ sub when_config_changed_grub { > update_copy_in_boot($_) foreach glob($::prefix . boot_copies_dir() . '/*.link'); > } > >+sub write_refind { >+ my ($bootloader, $_all_hds, $o_backup_extension) = @_; >+ >+ my @conf; >+ >+ foreach my $entry (@{$bootloader->{entries}}) { >+ if ($entry->{type} eq "image" && $entry->{kernel_or_dev} eq "/boot/vmlinuz") { >+ my $vga = $entry->{vga} || $bootloader->{vga}; >+ my $boot_params = join(' ', >+ "root=$entry->{root}", >+ $entry->{append}, >+ if_($entry->{'read-write'}, 'rw'), >+ if_($vga && $vga ne "normal", "vga=$vga") >+ ); >+ push @conf, '"' . simplify_label($entry->{label}) . '" "' . $boot_params . '"'; >+ } >+ } >+ my $f = "$::prefix/boot/refind_linux.conf"; >+ log::l("writing rEFInd config to $f"); >+ renamef($f, $f . ($o_backup_extension || '.old')); >+ output_with_perm($f, 0600, map { "$_\n" } @conf); >+ >+ check_enough_space(); >+} >+ >+sub install_refind { >+ my ($bootloader, $all_hds) = @_; >+ >+ write_refind($bootloader, $all_hds); >+} >+ >+sub when_config_changed_refind { >+ my ($_bootloader) = @_; >+ #- do not do anything >+} >+ > =item action($bootloader, $action, @para) > > Calls the C<$action> function with @para parameters:
diff --git a/perl-install/any.pm b/perl-install/any.pm index fd80a46..795e281 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -502,6 +502,12 @@ sub setupBootloader__entries { { label => N("Initrd"), val => \$e->{initrd}, list => [ map { if_(/^initrd/, "/boot/$_") } all("$::prefix/boot") ], not_edit => 0, advanced => 1 }, { label => N("Network profile"), val => \$netprofile, list => [ sort(uniq('', $netprofile, network::network::netprofile_list())) ], advanced => 1 }, ); + } elsif ($b->{method} eq 'refind') { + @l = ( + { label => N("Append"), val => \$append }, + { label => N("Video mode"), val => \$vga, list => [ '', Xconfig::resolution_and_depth::bios_vga_modes() ], + format => \&Xconfig::resolution_and_depth::to_string, advanced => 1 }, + ); } else { @l = ( { label => N("Root"), val => \$e->{kernel_or_dev}, list => [ map { "/dev/$_->{device}" } @$fstab, detect_devices::floppies() ] }, @@ -538,9 +544,15 @@ sub setupBootloader__entries { my $Add = sub { my @labels = map { $_->{label} } @{$b->{entries}}; my ($e, $prefix); - if ($in->ask_from_list_('', N("Which type of entry do you want to add?"), - [ N_("Linux"), N_("Other OS (Windows...)") ] - ) eq "Linux") { + if ($b->{method} eq 'refind') { + $e = { type => 'image', + kernel_or_dev => '/boot/vmlinuz', + root => '/dev/' . fs::get::root($fstab)->{device}, #- assume a good default. + }; + $prefix = "linux"; + } elsif ($in->ask_from_list_('', N("Which type of entry do you want to add?"), + [ N_("Linux"), N_("Other OS (Windows...)") ] + ) eq "Linux") { $e = { type => 'image', root => '/dev/' . fs::get::root($fstab)->{device}, #- assume a good default. }; @@ -586,6 +598,18 @@ sub setupBootloader__entries { }; my @prev_entries = @{$b->{entries}}; + + #- the rEFInd configuration file just provides alternative kernel command lines + #- so we only want to display entries that relate to the default kernel. + if ($b->{method} eq 'refind') { + @{$b->{entries}} = + grep { + my $pb = $_->{type} ne 'image' || $_->{kernel_or_dev} ne '/boot/vmlinuz'; + log::l("dropping bootloader entry $_->{label} because it is not needed by rEFInd") if $pb; + !$pb; + } @{$b->{entries}}; + } + if ($in->ask_from__add_modify_remove(N("Bootloader Configuration"), N("Here are the entries on your boot menu so far. You can create additional entries or change the existing ones."), [ { diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 9e75166..6fc525d 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -251,6 +251,8 @@ sub read { } elsif (my $type = partition_table::raw::typeOfMBR($_)) { warn "typeOfMBR $type on $_ for method $main_method\n" if $ENV{DEBUG}; $type; + } elsif (-e "/boot/EFI/EFI/refind" && -e "$::prefix/boot/refind_linux.conf") { + 'refind'; } else { () } } @devs; @@ -511,6 +513,36 @@ sub read_grub_menu_lst { \%b; } +=item read_refind ($fstab) + +Read back rEFInd config + C</boot/refind_linux.conf> + +=cut + +sub read_refind() { + my (%bootloader, $entry); + $bootloader{entries} = []; + foreach (cat_utf8("$::prefix/boot/refind_linux.conf")) { + next if /^#/; + my ($label, $append) = /"(.*)"\s"(.*)"/; + my $root = $1 if $append =~ s/root=(\S*)\s*//; + my $vga = $1 if $append =~ s/vga=(\S*)\s*//; + if ($label && $root) { + push @{$bootloader{entries}}, { + type => 'image', + kernel_or_dev => '/boot/vmlinuz', + label => $label, + root => $root, + append => $append, + vga => $vga + }; + } + } + + $bootloader{method} = 'refind'; + \%bootloader; +} + # FIXME: actually read back previous conf sub read_pmon2000() { +{ method => 'pmon2000' }; @@ -1245,6 +1277,7 @@ sub method2text { 'grub2' => N("GRUB2 with graphical menu"), 'grub-graphic' => N("GRUB with graphical menu"), 'grub-menu' => N("GRUB with text menu"), + 'refind' => N("rEFInd"), }->{$method}; } @@ -1255,12 +1288,15 @@ sub method_choices_raw { arch() =~ /arm/ ? 'uboot' : if_(!$b_prefix_mounted || whereis_binary('grub2-reboot', $::prefix), 'grub2'), - if_(!is_uefi(), ( + is_uefi() ? + if_(!$b_prefix_mounted || -e "/boot/EFI/EFI/refind", + 'refind') + : ( if_(!$b_prefix_mounted || whereis_binary('grub', $::prefix), 'grub-graphic', 'grub-menu'), if_(!$b_prefix_mounted || whereis_binary('lilo', $::prefix), 'lilo-menu'), - )); + ); } sub method_choices { my ($all_hds, $b_prefix_mounted) = @_; @@ -2017,6 +2053,42 @@ sub when_config_changed_grub { update_copy_in_boot($_) foreach glob($::prefix . boot_copies_dir() . '/*.link'); } +sub write_refind { + my ($bootloader, $_all_hds, $o_backup_extension) = @_; + + my @conf; + + foreach my $entry (@{$bootloader->{entries}}) { + if ($entry->{type} eq "image" && $entry->{kernel_or_dev} eq "/boot/vmlinuz") { + my $vga = $entry->{vga} || $bootloader->{vga}; + my $boot_params = join(' ', + "root=$entry->{root}", + $entry->{append}, + if_($entry->{'read-write'}, 'rw'), + if_($vga && $vga ne "normal", "vga=$vga") + ); + push @conf, '"' . simplify_label($entry->{label}) . '" "' . $boot_params . '"'; + } + } + my $f = "$::prefix/boot/refind_linux.conf"; + log::l("writing rEFInd config to $f"); + renamef($f, $f . ($o_backup_extension || '.old')); + output_with_perm($f, 0600, map { "$_\n" } @conf); + + check_enough_space(); +} + +sub install_refind { + my ($bootloader, $all_hds) = @_; + + write_refind($bootloader, $all_hds); +} + +sub when_config_changed_refind { + my ($_bootloader) = @_; + #- do not do anything +} + =item action($bootloader, $action, @para) Calls the C<$action> function with @para parameters:
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 15153
:
5844
|
5845
|
5932
|
5933
|
5936
|
5975
|
6187
|
6188
|
6308
|
8124
|
8125
|
8126
|
8127
|
8128
|
10371