Skip to content

Fix grub menuentry parsing on non-english systems #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pierre-Baudry wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix grub menuentry parsing on non-english systems #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kexec-reboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ end
def grub1_kernel_entries(config)
device_map = IO.read("/boot/grub/device.map")
entries = Array.new
config.scan(/title (.+?$).+?root \(([^\)]+)\).+?kernel ([^ ]+) (.+?)$.+?initrd (.+?$)/ms).each do |entry|
config.scan(/title (.+?$).+?root \(([^\)]+)\).+?kernel ([^ ]+) (.+?)$.+?initrd (.+?$)/mu).each do |entry|
begin
# Try hard-coded locations, works 99.9% of the time
mount_point = locate_kernel(entry[2])
Expand Down Expand Up @@ -123,7 +123,7 @@ end
# Load the available kernels from the given GRUB 2 configuration file
def grub2_kernel_entries(config)
entries = Array.new
config.scan(/menuentry '([^']+)'.+?\{.+?search.+?([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|[0-9A-F]{4}-[0-9A-F]{4}).+?\s+linux(efi|16)?\s+([^ ]+) (.+?)$.+?initrd(efi|16)?\s+(.+?)$.+?\}/ms).each do |entry|
config.scan(/menuentry '([^']+)'.+?\{.+?search.+?([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}|[0-9A-F]{4}-[0-9A-F]{4}).+?\s+linux(efi|16)?\s+([^ ]+) (.+?)$.+?initrd(efi|16)?\s+(.+?)$.+?\}/mu).each do |entry|
mount_point = uuid_to_mount_point(entry[1])
name = entry[0].strip
kernel = "#{mount_point}#{entry[3]}"
Expand Down