Fix grub-install with OS device name
PATCH 1/1 Fix grub-install with OS device name
* util/setup.c (SETUP): Accept new dev_is_drive argument. If passed, don't map dev to a GRUB drive again.
* include/grub/util/install.h (grub_util_bios_setup): Update prototype.
(grub_util_sparc_setup): Likewise.
* util/grub-install.c (main): Tell grub_util_bios_setup that install_drive has already been mapped to a GRUB drive. Likewise for grub_util_sparc_setup, and pass install_drive rather than install_device.
* util/grub-setup.c (main): Adjust call to GRUB_SETUP_FUNC.
--- ChangeLog | 13 +++++++++++++ include/grub/util/install.h | 4 ++-- util/grub-install.c | 8 +++++--- util/grub-setup.c | 2 +- util/setup.c | 39 ++++++++++++++++++++++----------------- 5 files changed, 43 insertions(+), 23 deletions(-)
ChangeLog +13 -0
@@ -1,5 +1,18 @@ 2013-12-04 Colin Watson <[email protected]> + * util/setup.c (SETUP): Accept new dev_is_drive argument. If + passed, don't map dev to a GRUB drive again. + * include/grub/util/install.h (grub_util_bios_setup): Update + prototype. + (grub_util_sparc_setup): Likewise. + * util/grub-install.c (main): Tell grub_util_bios_setup that + install_drive has already been mapped to a GRUB drive. Likewise for + grub_util_sparc_setup, and pass install_drive rather than + install_device. + * util/grub-setup.c (main): Adjust call to GRUB_SETUP_FUNC. + +2013-12-04 Colin Watson <[email protected]> + Copying the themes directory in grub-shell isn't parallel-test-friendly and breaks on the second test when the source directory is read-only (as in "make distcheck"). Instead, add a
include/grub/util/install.h +2 -2
@@ -180,12 +180,12 @@ grub_install_get_image_target (const char *arg);void grub_util_bios_setup (const char *dir,const char *boot_file,const char *core_file, -const char *dest,int force, +const char *dev,int dev_is_drive,int force,int fs_probe,int allow_floppy);void grub_util_sparc_setup (const char *dir,const char *boot_file,const char *core_file, -const char *dest,int force, +const char *dev,int dev_is_drive,int force,int fs_probe,int allow_floppy); char *
util/grub-install.c +5 -3
@@ -1436,11 +1436,12 @@ main (int argc, char *argv[]) platdir, device_map, install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_bios_setup (platdir,"boot.img" ,"core.img" , - install_drive, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }
@@ -1461,12 +1462,13 @@ main (int argc, char *argv[]) !fs_probe ?"--skip-fs-probe" :"" , platdir, device_map, - install_drive); + install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_sparc_setup (platdir,"boot.img" ,"core.img" , - install_device, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }
util/grub-setup.c +1 -1
@@ -254,7 +254,7 @@ main (int argc, char *argv[])GRUB_SETUP_FUNC (arguments.dir ? :DEFAULT_DIRECTORY , arguments.boot_file ? :DEFAULT_BOOT_FILE , arguments.core_file ? :DEFAULT_CORE_FILE , - arguments.device, arguments.force, + arguments.device,0 , arguments.force, arguments.fs_probe, arguments.allow_floppy);/* Free resources. */
util/setup.c +22 -17
@@ -247,7 +247,7 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)),void SETUP (const char *dir,const char *boot_file,const char *core_file, -const char *dev,int force, +const char *dev,int dev_is_drive,int force,int fs_probe,int allow_floppy) {char *core_path;
@@ -270,25 +270,30 @@ SETUP (const char *dir,#endif bl.last_length =0 ; - { -size_t len =strlen (dev); +if (dev_is_drive) + dest =xstrdup (dev); +else + { +/* Perhaps the user specified a parenthesised GRUB drive name. */ +size_t len =strlen (dev); -if (len >2 && dev[0 ] =='(' && dev[len -1 ] ==')' ) - { - dest =xmalloc (len -1 ); -strncpy (dest, dev +1 , len -2 ); - dest[len -2 ] ='\0' ; - } - } +if (len >2 && dev[0 ] =='(' && dev[len -1 ] ==')' ) + { + dest =xmalloc (len -1 ); +strncpy (dest, dev +1 , len -2 ); + dest[len -2 ] ='\0' ; + } -if (! dest) - { -/* Possibly, the user specified an OS device file. */ - dest =grub_util_get_grub_dev (dev);if (! dest) -grub_util_error (_ ("Invalid device `%s'.\n" ), dev); -grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , - dev, dest); + { +/* Possibly, the user specified an OS device file. */ +grub_util_pull_device (dev); + dest =grub_util_get_grub_dev (dev); +if (! dest) +grub_util_error (_ ("Invalid device `%s'.\n" ), dev); +grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , + dev, dest); + } }
Signature · 1 line
1.8.4.4
Quoted 11 lines · Colin Watson
*
util/setup.c(SETUP): Accept newdev_is_driveargument. If passed, don't map dev to a GRUB drive again.
*include/grub/util/install.h(grub_util_bios_setup): Update prototype.
(grub_util_sparc_setup): Likewise.
*util/grub-install.c(main): Tellgrub_util_bios_setupthatinstall_drivehas already been mapped to a GRUB drive. Likewise forgrub_util_sparc_setup, and passinstall_driverather thaninstall_device.
*util/grub-setup.c(main): Adjust call toGRUB_SETUP_FUNC.
Tested successfully on i386-pc in a QEMU VM.
-Jon
Quoted 1 line · Jonathan McCune
Tested successfully on i386-pc in a QEMU VM.
Thanks. I made a slight mistake, though, and broke the case of "grub-install '(hd0)'", which is what Andrey had been trying to fix in the first place. Here's a better version which I've tested to handle both OS and GRUB device forms successfully.
ChangeLog +13 -0
@@ -1,3 +1,16 @@ +2013-12-04 Colin Watson <[email protected]> + + * util/setup.c (SETUP): Accept new dev_is_drive argument. If + passed, don't map dev to a GRUB drive again. + * include/grub/util/install.h (grub_util_bios_setup): Update + prototype. + (grub_util_sparc_setup): Likewise. + * util/grub-install.c (main): Tell grub_util_bios_setup that + install_drive has already been mapped to a GRUB drive. Likewise for + grub_util_sparc_setup, and pass install_drive rather than + install_device. + * util/grub-setup.c (main): Adjust call to GRUB_SETUP_FUNC. + 2013-12-04 Vladimir Serbinenko <[email protected]> * grub-core/boot/sparc64/ieee1275/boot.S [CDBOOT]: Move scratchpad
include/grub/util/install.h +2 -2
@@ -180,12 +180,12 @@ grub_install_get_image_target (const char *arg);void grub_util_bios_setup (const char *dir,const char *boot_file,const char *core_file, -const char *dest,int force, +const char *dev,int dev_is_drive,int force,int fs_probe,int allow_floppy);void grub_util_sparc_setup (const char *dir,const char *boot_file,const char *core_file, -const char *dest,int force, +const char *dev,int dev_is_drive,int force,int fs_probe,int allow_floppy); char *
util/grub-install.c +5 -3
@@ -1436,11 +1436,12 @@ main (int argc, char *argv[]) platdir, device_map, install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_bios_setup (platdir,"boot.img" ,"core.img" , - install_drive, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }
@@ -1461,12 +1462,13 @@ main (int argc, char *argv[]) !fs_probe ?"--skip-fs-probe" :"" , platdir, device_map, - install_drive); + install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_sparc_setup (platdir,"boot.img" ,"core.img" , - install_device, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }
util/grub-setup.c +1 -1
@@ -254,7 +254,7 @@ main (int argc, char *argv[])GRUB_SETUP_FUNC (arguments.dir ? :DEFAULT_DIRECTORY , arguments.boot_file ? :DEFAULT_BOOT_FILE , arguments.core_file ? :DEFAULT_CORE_FILE , - arguments.device, arguments.force, + arguments.device,0 , arguments.force, arguments.fs_probe, arguments.allow_floppy);/* Free resources. */
util/setup.c +14 -7
@@ -247,7 +247,7 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)),void SETUP (const char *dir,const char *boot_file,const char *core_file, -const char *dev,int force, +const char *dev,int dev_is_drive,int force,int fs_probe,int allow_floppy) {char *core_path;
@@ -271,6 +271,7 @@ SETUP (const char *dir, bl.last_length =0 ; { +/* Perhaps the user specified a parenthesised GRUB drive name. */ size_t len =strlen (dev);if (len >2 && dev[0 ] =='(' && dev[len -1 ] ==')' )
@@ -283,12 +284,18 @@ SETUP (const char *dir,if (! dest) { -/* Possibly, the user specified an OS device file. */ - dest =grub_util_get_grub_dev (dev); -if (! dest) -grub_util_error (_ ("Invalid device `%s'.\n" ), dev); -grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , - dev, dest); +if (dev_is_drive) + dest =xstrdup (dev); +else + { +/* Possibly, the user specified an OS device file. */ +grub_util_pull_device (dev); + dest =grub_util_get_grub_dev (dev); +if (! dest) +grub_util_error (_ ("Invalid device `%s'.\n" ), dev); +grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , + dev, dest); + } }
Signature · 5 lines
1.8.4.4 -- Colin Watson [[email protected]]
Отправлено с iPhone
Quoted 10 lines
04 дек. 2013 г., в 23:15, Colin Watson <[email protected]> написал(а):
Quoted 2 lines · Jonathan McCune
Tested successfully on i386-pc in a QEMU VM.
Thanks. I made a slight mistake, though, and broke the case of "grub-install '(hd0)'", which is what Andrey had been trying to fix in the first place. Here's a better version which I've tested to handle both OS and GRUB device forms successfully.
Ouch. It becomes messier and messier ... :) Why not simply drop resolution of device in grub-install? Let's do it in one place.
Quoted 144 lines
ChangeLog +13
-0@@ -1,3 +1,16 @@ +2013-12-04 Colin Watson <[email protected]> + + * util/setup.c (SETUP): Accept new dev_is_drive argument. If + passed, don't map dev to a GRUB drive again. + * include/grub/util/install.h (grub_util_bios_setup): Update + prototype. + (grub_util_sparc_setup): Likewise. + * util/grub-install.c (main): Tell grub_util_bios_setup that + install_drive has already been mapped to a GRUB drive. Likewise for + grub_util_sparc_setup, and pass install_drive rather than + install_device. + * util/grub-setup.c (main): Adjust call to GRUB_SETUP_FUNC. +2013-12-04 Vladimir Serbinenko <[email protected]>
*
grub-core/boot/sparc64/ieee1275/boot.S[CDBOOT]: Move scratchpadinclude/grub/util/install.h +0
-0@@ -180,12 +180,12 @@ grub_install_get_image_target (const char *arg);void
grub_util_bios_setup(const char *dir,
const char*boot_file, const char*core_file,include/grub/util/install.h +1
-1- const char *dest, int force, + const char *dev, int dev_is_drive, int force, int fs_probe, int allow_floppy);void
grub_util_sparc_setup(const char *dir,
const char*boot_file, const char*core_file,include/grub/util/install.h +1
-1- const char *dest, int force, + const char *dev, int dev_is_drive, int force, int fs_probe, int allow_floppy);char *
util/grub-install.c +5
-3@@ -1436,11 +1436,12 @@ main (int argc, char *argv[]) platdir, device_map, install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_bios_setup (platdir,"boot.img" ,"core.img" , - install_drive, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }@@ -1461,12 +1462,13 @@ main (int argc, char *argv[]) !fs_probe ?"--skip-fs-probe" :"" , platdir, device_map, - install_drive); + install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_sparc_setup (platdir,"boot.img" ,"core.img" , - install_device, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }util/grub-setup.c +1
-1@@ -254,7 +254,7 @@ main (int argc, char *argv[])GRUB_SETUP_FUNC (arguments.dir ? :DEFAULT_DIRECTORY , arguments.boot_file ? :DEFAULT_BOOT_FILE , arguments.core_file ? :DEFAULT_CORE_FILE , - arguments.device, arguments.force, + arguments.device,0 , arguments.force, arguments.fs_probe, arguments.allow_floppy);/* Free resources. */ util/setup.c +0
-0@@ -247,7 +247,7 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)),void
SETUP (const char *dir,
const char*boot_file, const char*core_file,util/setup.c +1
-1- const char *dev, int force, + const char *dev, int dev_is_drive, int force, int fs_probe, int allow_floppy){
char*core_path;util/setup.c +13
-6@@ -271,6 +271,7 @@ SETUP (const char *dir, bl.last_length =0 ; { +/* Perhaps the user specified a parenthesised GRUB drive name. */ size_t len =strlen (dev);if (len >2 && dev[0 ] =='(' && dev[len -1 ] ==')' )@@ -283,12 +284,18 @@ SETUP (const char *dir,if (! dest) { -/* Possibly, the user specified an OS device file. */ - dest =grub_util_get_grub_dev (dev); -if (! dest) -grub_util_error (_ ("Invalid device `%s'.\n" ), dev); -grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , - dev, dest); +if (dev_is_drive) + dest =xstrdup (dev); +else + { +/* Possibly, the user specified an OS device file. */ +grub_util_pull_device (dev); + dest =grub_util_get_grub_dev (dev); +if (! dest) +grub_util_error (_ ("Invalid device `%s'.\n" ), dev); +grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , + dev, dest); + } }Signature · 10 lines
1.8.4.4 -- Colin Watson [[email protected]] _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 9 lines · On Thu, Dec 5, 2013 at 9:56 AM, <[email protected]> wrote:
Отправлено с iPhone
Quoted 5 lines
04 дек. 2013 г., в 23:15, Colin Watson <[email protected]> написал(а):
Quoted 2 lines · Jonathan McCune
Tested successfully on i386-pc in a QEMU VM.
Quoted 8 lines
Quoted 5 lines
Thanks. I made a slight mistake, though, and broke the case of "grub-install '(hd0)'", which is what Andrey had been trying to fix in the first place. Here's a better version which I've tested to handle both OS and GRUB device forms successfully.
Ouch. It becomes messier and messier ... :) Why not simply drop resolution of device in grub-install? Let's do it in one place.
One should not answer that early in the morning ...
Colin, I see where the problem is, but let's do not complicate it even further. The real fix is to revert my patch and simply strip parenthesis in grub-install (with suitable modification of is_same_disk). Feel free to do it, otherwise I'll fix it on weekend.
Quoted 145 lines
Quoted 145 lines
ChangeLog +13
-0@@ -1,3 +1,16 @@ +2013-12-04 Colin Watson <[email protected]> + + * util/setup.c (SETUP): Accept new dev_is_drive argument. If + passed, don't map dev to a GRUB drive again. + * include/grub/util/install.h (grub_util_bios_setup): Update + prototype. + (grub_util_sparc_setup): Likewise. + * util/grub-install.c (main): Tell grub_util_bios_setup that + install_drive has already been mapped to a GRUB drive. Likewise for + grub_util_sparc_setup, and pass install_drive rather than + install_device. + * util/grub-setup.c (main): Adjust call to GRUB_SETUP_FUNC. +2013-12-04 Vladimir Serbinenko <[email protected]>
*
grub-core/boot/sparc64/ieee1275/boot.S[CDBOOT]: Move scratchpadinclude/grub/util/install.h +0
-0@@ -180,12 +180,12 @@ grub_install_get_image_target (const char *arg);void
grub_util_bios_setup(const char *dir,
const char*boot_file, const char*core_file,include/grub/util/install.h +1
-1- const char *dest, int force, + const char *dev, int dev_is_drive, int force, int fs_probe, int allow_floppy);void
grub_util_sparc_setup(const char *dir,
const char*boot_file, const char*core_file,include/grub/util/install.h +1
-1- const char *dest, int force, + const char *dev, int dev_is_drive, int force, int fs_probe, int allow_floppy);char *
util/grub-install.c +5
-3@@ -1436,11 +1436,12 @@ main (int argc, char *argv[]) platdir, device_map, install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_bios_setup (platdir,"boot.img" ,"core.img" , - install_drive, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }@@ -1461,12 +1462,13 @@ main (int argc, char *argv[]) !fs_probe ?"--skip-fs-probe" :"" , platdir, device_map, - install_drive); + install_device); +grub_util_info ("('%s' mapped to '%s')" , install_device, install_drive);/* Now perform the installation. */ if (install_bootsector)grub_util_sparc_setup (platdir,"boot.img" ,"core.img" , - install_device, force, + install_drive,1 , force, fs_probe, allow_floppy);break ; }util/grub-setup.c +1
-1@@ -254,7 +254,7 @@ main (int argc, char *argv[])GRUB_SETUP_FUNC (arguments.dir ? :DEFAULT_DIRECTORY , arguments.boot_file ? :DEFAULT_BOOT_FILE , arguments.core_file ? :DEFAULT_CORE_FILE , - arguments.device, arguments.force, + arguments.device,0 , arguments.force, arguments.fs_probe, arguments.allow_floppy);/* Free resources. */ util/setup.c +0
-0@@ -247,7 +247,7 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)),void
SETUP (const char *dir,
const char*boot_file, const char*core_file,util/setup.c +1
-1- const char *dev, int force, + const char *dev, int dev_is_drive, int force, int fs_probe, int allow_floppy){
char*core_path;util/setup.c +13
-7@@ -271,6 +271,7 @@ SETUP (const char *dir, bl.last_length =0 ; { +/* Perhaps the user specified a parenthesised GRUB drive name. */ size_t len =strlen (dev);if (len >2 && dev[0 ] =='(' && dev[len -1 ] ==')' )@@ -283,12 +284,18 @@ SETUP (const char *dir,if (! dest) { -/* Possibly, the user specified an OS device file. */ - dest =grub_util_get_grub_dev (dev); -if (! dest) -grub_util_error (_ ("Invalid device `%s'.\n" ), dev); -grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , - dev, dest); +if (dev_is_drive) + dest =xstrdup (dev); +else + { +/* Possibly, the user specified an OS device file. */ +grub_util_pull_device (dev); + dest =grub_util_get_grub_dev (dev); +if (! dest) +grub_util_error (_ ("Invalid device `%s'.\n" ), dev); +grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , + dev, dest); + } } --1.8.4.4
--
Colin Watson [[email protected]]_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH 1/2 revert 69ca97c820, it broke using OS device name as install device
grub-install already performs install device to grub device mapping (it needs it to compare install and /boot devices), so after this patch SETUP got called with grub device and tried to perform mapping again.
--- ChangeLog | 5 +++++ util/grub-setup.c | 41 ++++++++++++++++++++++++++++++++++++++++- util/setup.c | 26 +------------------------- 3 files changed, 46 insertions(+), 26 deletions(-)
ChangeLog +5 -0
@@ -1,3 +1,8 @@ +2013-11-29 Andrey Borzenkov <[email protected]> + + Revert commit 69ca97c820, it cause failures in using OS device name + in grub-install. + 2013-12-06 Vladimir Serbinenko <[email protected]> Don't add -mlong-calls when compiling with clang.
util/grub-setup.c +40 -1
66 lines not on this page · raw message
util/setup.c +1 -25
@@ -247,13 +247,12 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)),void SETUP (const char *dir,const char *boot_file,const char *core_file, -const char *dev,int force, +const char *dest,int force,int fs_probe,int allow_floppy) {char *core_path;char *boot_img, *core_img, *boot_path;char *root =0 ; -char *dest =0 ;size_t boot_size, core_size;#ifdef GRUB_SETUP_BIOS grub_uint16_t core_sectors;
@@ -270,28 +269,6 @@ SETUP (const char *dir,#endif bl.last_length =0 ; - { -size_t len =strlen (dev); - -if (len >2 && dev[0 ] =='(' && dev[len -1 ] ==')' ) - { - dest =xmalloc (len -1 ); -strncpy (dest, dev +1 , len -2 ); - dest[len -2 ] ='\0' ; - } - } - -if (! dest) - { -/* Possibly, the user specified an OS device file. */ - dest =grub_util_get_grub_dev (dev); -if (! dest) -grub_util_error (_ ("Invalid device `%s'.\n" ), dev); -grub_util_info ("transformed OS device `%s' into GRUB device `%s'" , - dev, dest); - } - -/* Read the boot image by the OS service. */ boot_path =grub_util_get_path (dir, boot_file); boot_size =grub_util_get_image_size (boot_path);
@@ -326,7 +303,6 @@ SETUP (const char *dir, dest_dev =grub_device_open (dest);if (! dest_dev)grub_util_error ("%s" , grub_errmsg); -free (dest); core_dev = dest_dev;
Signature · 1 line
1.8.1.4
PATCH 2/2 second attempt to fix using grub device name as install device
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).
--- ChangeLog | 4 ++-- util/grub-install.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-)
ChangeLog +2 -2
@@ -1,7 +1,7 @@ 2013-11-29 Andrey Borzenkov <[email protected]> - Revert commit 69ca97c820, it cause failures in using OS device name - in grub-install. + 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-06 Vladimir Serbinenko <[email protected]>
util/grub-install.c +5 -1
@@ -1098,7 +1098,11 @@ main (int argc, char *argv[]) {if (install_device[0 ] =='(' && install_device[grub_strlen (install_device) -1 ] ==')' ) - install_drive =xstrdup (install_device); + { + install_device[grub_strlen (install_device) -1 ] ='\0' ; + install_drive =xstrdup (install_device +1 ); + install_device[grub_strlen (install_device) -1 ] =')' ; + }else {grub_util_pull_device (install_device);
Signature · 1 line
1.8.1.4
Re: [PATCH 2/2] second attempt to fix using grub device name as install device
util/grub-install.c main (int argc, char *argv[]) · line 1105
Quoted 4 lines · Andrey Borzenkov
util/grub-install.c +4
-0+ install_device[grub_strlen (install_device) -1 ] ='\0' ; + install_drive =xstrdup (install_device +1 ); + install_device[grub_strlen (install_device) -1 ] =')' ; + }
Bad code. You forgot that grub_strlen changes with your operations. You need to keep explicit pointer.
Re: [PATCH 2/2] second attempt to fix using grub device name as install device
В Sat, 07 Dec 2013 09:47:44 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:
Quoted 9 lines · Andrey Borzenkov
util/grub-install.c main (int argc, char *argv[]) · line 1105
Quoted 4 lines
util/grub-install.c +4
-0+ install_device[grub_strlen (install_device) -1 ] ='\0' ; + install_drive =xstrdup (install_device +1 ); + install_device[grub_strlen (install_device) -1 ] =')' ; + }Bad code. You forgot that
grub_strlenchanges with your operations. You need to keep explicit pointer.
Oops. Any reason "our" gnulib is missing xstrndup? It is not the only place where it will make things more simple and readable.
Re: [PATCH 2/2] second attempt to fix using grub device name as install device
Quoted 13 lines · Andrey Borzenkov
В Sat, 07 Dec 2013 09:47:44 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:Quoted 9 lines · Andrey Borzenkov
util/grub-install.c main (int argc, char *argv[]) · line 1105
Quoted 4 lines
util/grub-install.c +4
-0+ install_device[grub_strlen (install_device) -1 ] ='\0' ; + install_drive =xstrdup (install_device +1 ); + install_device[grub_strlen (install_device) -1 ] =')' ; + }Bad code. You forgot that
grub_strlenchanges with your operations. You need to keep explicit pointer.
Quoted 3 lines
Oops. Any reason "our" gnulib is missing xstrndup? It is not the only place where it will make things more simple and readable.
xmalloc + memcpy + '\0' terminator in this case does the same, a little bit more efficiently.
Quoted 7 lines
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH v2 2/2 second attempt to fix using grub device name as install device
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).
--- ChangeLog | 4 ++-- util/grub-install.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)
ChangeLog +2 -2
@@ -1,7 +1,7 @@ 2013-11-29 Andrey Borzenkov <[email protected]> - Revert commit 69ca97c820, it cause failures in using OS device name - in grub-install. + 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-06 Vladimir Serbinenko <[email protected]>
util/grub-install.c +7 -1
@@ -1098,7 +1098,13 @@ main (int argc, char *argv[]) {if (install_device[0 ] =='(' && install_device[grub_strlen (install_device) -1 ] ==')' ) - install_drive =xstrdup (install_device); + { + +size_t len =grub_strlen (install_device) -2 ; + install_drive =xmalloc (len +1 ); +memcpy (install_drive, install_device +1 , len); + install_drive[len] ='\0' ; + }else {grub_util_pull_device (install_device);
Signature · 1 line
tg: (074285e..) u/fix-grub-install-on-hdX (depends on: u/revert-69ca97c820)
Re: [PATCH 2/2 v2] second attempt to fix using grub device name as install device
Quoted 3 lines · Andrey Borzenkov
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).
Did you test it with both syntaxes?
Quoted 39 lines
--- ChangeLog | 4 ++-- util/grub-install.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-)ChangeLog +2
-2@@ -1,7 +1,7 @@ 2013-11-29 Andrey Borzenkov <[email protected]> - Revert commit 69ca97c820, it cause failures in using OS device name - in grub-install. + 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-06 Vladimir Serbinenko <[email protected]>util/grub-install.c +7
-1@@ -1098,7 +1098,13 @@ main (int argc, char *argv[]) {if (install_device[0 ] =='(' && install_device[grub_strlen (install_device) -1 ] ==')' ) - install_drive =xstrdup (install_device); + { + +size_t len =grub_strlen (install_device) -2 ; + install_drive =xmalloc (len +1 ); +memcpy (install_drive, install_device +1 , len); + install_drive[len] ='\0' ; + }else {grub_util_pull_device (install_device);
Re: [PATCH 2/2 v2] second attempt to fix using grub device name as install device
В Sat, 07 Dec 2013 14:50:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:
Quoted 5 lines · Andrey Borzenkov
Quoted 3 lines
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).
Did you test it with both syntaxes?
Yes.
linux-cor4:~ # /usr/local/grub2/sbin/grub-install '(hd1)'
FATAL: Error inserting efivars (/lib/modules/3.11.6-4-pae/kernel/drivers/firmware/efi/efivars.ko): No such device /usr/local/grub2/sbin/grub-install: warning: cannot open directory `/usr/local/grub2/share/locale': No such file or directory. Installation finished. No error reported.
linux-cor4:~ # /usr/local/grub2/sbin/grub-install /dev/sdb
FATAL: Error inserting efivars (/lib/modules/3.11.6-4-pae/kernel/drivers/firmware/efi/efivars.ko): No such device /usr/local/grub2/sbin/grub-install: warning: cannot open directory `/usr/local/grub2/share/locale': No such file or directory. Installation finished. No error reported.
linux-cor4:~ # /usr/local/grub2/sbin/grub-install /dev/disk/by-id/ata-QEMU_HARDDISK_QM00002
FATAL: Error inserting efivars (/lib/modules/3.11.6-4-pae/kernel/drivers/firmware/efi/efivars.ko): No such device /usr/local/grub2/sbin/grub-install: warning: cannot open directory `/usr/local/grub2/share/locale': No such file or directory. Installation finished. No error reported.
linux-cor4:~ # cat /boot/grub/device.map
(hd0) /dev/disk/by-id/ata-QEMU_HARDDISK_QM00001
(hd1) /dev/disk/by-id/ata-QEMU_HARDDISK_QM00002
linux-cor4:~ # exit
Re: [PATCH 2/2 v2] second attempt to fix using grub device name as install device
Quoted 11 lines · Andrey Borzenkov
В Sat, 07 Dec 2013 14:50:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:Quoted 5 lines · Andrey Borzenkov
Quoted 3 lines
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).
Did you test it with both syntaxes?
Yes.
Go ahead for both parts.
Colin told on IRC that he's ok with this patch as well.
Quoted 24 lines
linux-cor4:~ #
/usr/local/grub2/sbin/grub-install'(hd1)'
FATAL: Error inserting efivars (/lib/modules/3.11.6-4-pae/kernel/drivers/firmware/efi/efivars.ko): No such device/usr/local/grub2/sbin/grub-install: warning: cannot open directory `/usr/local/grub2/share/locale': No such file or directory. Installation finished. No error reported.
linux-cor4:~ #/usr/local/grub2/sbin/grub-install/dev/sdb
FATAL: Error inserting efivars (/lib/modules/3.11.6-4-pae/kernel/drivers/firmware/efi/efivars.ko): No such device/usr/local/grub2/sbin/grub-install: warning: cannot open directory `/usr/local/grub2/share/locale': No such file or directory. Installation finished. No error reported.
linux-cor4:~ #/usr/local/grub2/sbin/grub-install/dev/disk/by-id/ata-QEMU_HARDDISK_QM00002
FATAL: Error inserting efivars (/lib/modules/3.11.6-4-pae/kernel/drivers/firmware/efi/efivars.ko): No such device/usr/local/grub2/sbin/grub-install: warning: cannot open directory `/usr/local/grub2/share/locale': No such file or directory. Installation finished. No error reported.
linux-cor4:~ # cat/boot/grub/device.map
(hd0)/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001
(hd1)/dev/disk/by-id/ata-QEMU_HARDDISK_QM00002
linux-cor4:~ # exit_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel