vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/getroot.c (grub_util_biosdisk_get_grub_dev): Zero out

Browse source 
grub_errno in the case where we handle GRUB_ERR_UNKNOWN_DEVICE by
falling back to the partition device, otherwise a later call to this
function may fail spuriously.
Reported by Axel Beckert.  Fixes Debian bug #708614.
This commit is contained in:
Colin Watson 2013-08-13 17:48:56 +02:00
parent 273349fe42
commit 36e87d25e1
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2013-08-13 Colin Watson <cjwatson@ubuntu.com>
* util/getroot.c (grub_util_biosdisk_get_grub_dev): Zero out
grub_errno in the case where we handle GRUB_ERR_UNKNOWN_DEVICE by
falling back to the partition device, otherwise a later call to this
function may fail spuriously.
Reported by Axel Beckert. Fixes Debian bug #708614.
2013-08-12 Grégoire Sutre <gregoire.sutre@gmail.com> 2013-08-12 Grégoire Sutre <gregoire.sutre@gmail.com>
* autogen.sh: Replace find -not by the POSIX-compliant find !. * autogen.sh: Replace find -not by the POSIX-compliant find !.

1
util/getroot.c
View file

@ -2408,6 +2408,7 @@ grub_util_biosdisk_get_grub_dev (const char *os_dev)
grub_util_warn grub_util_warn
(_("disk does not exist, so falling back to partition device %s"), (_("disk does not exist, so falling back to partition device %s"),
os_dev); os_dev);
grub_errno = GRUB_ERR_NONE;
canon = canonicalize_file_name (os_dev); canon = canonicalize_file_name (os_dev);
drive = find_system_device (canon ? : os_dev, &st, 0, 1); drive = find_system_device (canon ? : os_dev, &st, 0, 1);