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

second attempt to fix using grub device name as install device

Browse source 
grub-install already resolved passed install device to grub device. So do the
same as grub-setup and strip parenthesis if we get legacy (hdX).

I accidentally commited revert of 69ca97c820 and
this patch as part of f585c90505. So this commit
just adds ChangeLog entry and cosmetic whitespace fix.
This commit is contained in:
Andrey Borzenkov 2013-12-07 18:58:19 +04:00
parent f585c90505
commit 92e9352ded
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com>
Revert commit 69ca97c820, it caused failures when using OS device name
in grub-install. Instead just strip off parenthesis in grub-install
if (hdX) was passed.
2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com> 2013-12-07 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub-install.c (push_partmap_module): Add helper to convert * util/grub-install.c (push_partmap_module): Add helper to convert

1
util/grub-install.c
View file

@ -1104,7 +1104,6 @@ main (int argc, char *argv[])
if (install_device[0] == '(' if (install_device[0] == '('
&& install_device[grub_strlen (install_device) - 1] == ')') && install_device[grub_strlen (install_device) - 1] == ')')
{ {
size_t len = grub_strlen (install_device) - 2; size_t len = grub_strlen (install_device) - 2;
install_drive = xmalloc (len + 1); install_drive = xmalloc (len + 1);
memcpy (install_drive, install_device + 1, len); memcpy (install_drive, install_device + 1, len);