diff --git a/grub2/acl_security.pl b/grub2/acl_security.pl index e5564aa28..8635b18f6 100644 --- a/grub2/acl_security.pl +++ b/grub2/acl_security.pl @@ -12,21 +12,16 @@ our (%in, %text); sub acl_security_form { my ($o) = @_; -print &ui_table_span(&ui_tag('b', &html_escape($text{'acl_section_view'}))); -# View is separated because it controls whether the module can be entered. -foreach my $a (qw(view)) { - print &ui_table_row($text{'acl_'.$a}, - &ui_yesno_radio($a, &grub2_check_acl($a, $o)), 3); - } +# View permissions +print &ui_table_row($text{'acl_view'}, + &ui_yesno_radio("view", &grub2_check_acl("view", $o)), 3); print &ui_table_hr(); -print &ui_table_span(&ui_tag('b', &html_escape($text{'acl_section_change'}))); # Change permissions modify GRUB configuration without granting install rights. foreach my $a (qw(edit security apply runtime)) { print &ui_table_row($text{'acl_'.$a}, &ui_yesno_radio($a, &grub2_check_acl($a, $o)), 3); } print &ui_table_hr(); -print &ui_table_span(&ui_tag('b', &html_escape($text{'acl_section_admin'}))); # Admin permissions expose direct file editing, backup, and boot-loader install. foreach my $a (qw(manual install backup)) { print &ui_table_row($text{'acl_'.$a}, diff --git a/grub2/lang/en b/grub2/lang/en index 61bfe252d..db9a8f4bf 100644 --- a/grub2/lang/en +++ b/grub2/lang/en @@ -312,9 +312,6 @@ runtime_eselector=Unsafe or invalid GRUB boot entry selector. runtime_eaction=No GRUB boot action was selected. delete_enone=Select one or more boot menu entries to delete. delete_ecustom=Only custom menu entries from the configured custom file can be deleted here. -acl_section_view=View permissions -acl_section_change=Change permissions -acl_section_admin=Administrative permissions acl_view=View GRUB configuration and boot entries acl_edit=Edit common GRUB defaults acl_security=Edit GRUB password protection