mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
From: Peter Jones <pjones@redhat.com>
|
||
Date: Fri, 31 Aug 2018 16:42:03 -0400
|
||
Subject: [PATCH] Make "reset" an alias for the "reboot" command.
|
||
|
||
I'm really tired of half the tools I get to use having one and the other half
|
||
having the other.
|
||
|
||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||
---
|
||
grub-core/commands/reboot.c | 11 +++++++----
|
||
1 file changed, 7 insertions(+), 4 deletions(-)
|
||
|
||
diff --git a/grub-core/commands/reboot.c b/grub-core/commands/reboot.c
|
||
index 46d364c99a9..f5cc2283636 100644
|
||
--- a/grub-core/commands/reboot.c
|
||
+++ b/grub-core/commands/reboot.c
|
||
@@ -32,15 +32,18 @@ grub_cmd_reboot (grub_command_t cmd __attribute__ ((unused)),
|
||
grub_reboot ();
|
||
}
|
||
|
||
-static grub_command_t cmd;
|
||
+static grub_command_t reboot_cmd, reset_cmd;
|
||
|
||
GRUB_MOD_INIT(reboot)
|
||
{
|
||
- cmd = grub_register_command ("reboot", grub_cmd_reboot,
|
||
- 0, N_("Reboot the computer."));
|
||
+ reboot_cmd = grub_register_command ("reboot", grub_cmd_reboot,
|
||
+ 0, N_("Reboot the computer."));
|
||
+ reset_cmd = grub_register_command ("reset", grub_cmd_reboot,
|
||
+ 0, N_("Reboot the computer."));
|
||
}
|
||
|
||
GRUB_MOD_FINI(reboot)
|
||
{
|
||
- grub_unregister_command (cmd);
|
||
+ grub_unregister_command (reboot_cmd);
|
||
+ grub_unregister_command (reset_cmd);
|
||
}
|