Skip to contentSkip to conversation

Install_c merge intention

PATCH In review Vladimir 'φ-coder/phcoder' Serbinenko 3 participants 13 messages Nov 9, 2013 – Dec 2, 2013

lore
Share & tools
lore
#1 lore raw

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

Does not build here

util/grub-mkimage.c:48:29: fatal error: grub/emu/config.h: Нет такого файла или каталога compilation terminated.

HEAD is 1622e97606772a1a1c841ba15c67b8d5b419a027.

#2 lore raw
Quoted 8 lines · Andrey Borzenkov

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

Quoted 5 lines

Does not build here

util/grub-mkimage.c:48:29: fatal error: grub/emu/config.h: Нет такого файла или каталога compilation terminated.

It was improperly ignored. Added it and pushed.
Thanks.

Quoted 9 lines

HEAD is 1622e97606772a1a1c841ba15c67b8d5b419a027.

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#3 lore raw

PATCH 1/1 fix qsort invocation in grub-install

Order of elements number and size is reversed.

---
 util/grub-install.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
util/grub-install.c +1 -1
index 11010cc..87a0b3b 100644
@@ -560,7 +560,7 @@ device_map_check_duplicates (const char *dev_map)
 
   fclose (fp);
 
-  qsort (d, sizeof (d[0]), filled, (int (*) (const void *, const void *))strcmp);
+  qsort (d, filled, sizeof (d[0]), (int (*) (const void *, const void *))strcmp);
 
   for (i = 0; i + 1 < filled; i++)
     if (strcmp (d[i], d[i+1]) == 0)
Signature · 1 line
tg: (24685ac..) u/install_c-qsort (depends on: phcoder/install_c)
#4 lore raw

Re: [PATCH] fix qsort invocation in grub-install

Quoted 2 lines · Andrey Borzenkov

Order of elements number and size is reversed.

Go ahead.

Quoted 18 lines
---
 util/grub-install.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
util/grub-install.c +1 -1
index 11010cc..87a0b3b 100644
@@ -560,7 +560,7 @@ device_map_check_duplicates (const char *dev_map)
 
   fclose (fp);
 
-  qsort (d, sizeof (d[0]), filled, (int (*) (const void *, const void *))strcmp);
+  qsort (d, filled, sizeof (d[0]), (int (*) (const void *, const void *))strcmp);
 
   for (i = 0; i + 1 < filled; i++)
     if (strcmp (d[i], d[i+1]) == 0)
#5 lore raw
In reply to Vladimir 'φ-coder/phcoder' Serbinenko

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

As was discussed before

- shell grub-istall provides relatively easy way to track what is done (which modules are selected etc). Binary grub-install does not. It was suggested to enable easy access to this information (like echoing invocations of grub-mkimage and grub-setup). This is missing currently.

- looks like shell backticks in /etc/default/grub are not evaluated or I missed it. Only normal shell quoting is interpreted.

- I guess before merging obsolete shell commands should be removed? They are still present.

#6 lore raw
Quoted 8 lines · Andrey Borzenkov

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

Quoted 8 lines

As was discussed before

- shell grub-istall provides relatively easy way to track what is done (which modules are selected etc). Binary grub-install does not. It was suggested to enable easy access to this information (like echoing invocations of grub-mkimage and grub-setup). This is missing currently.

I added it. Is the one I added enough?

Quoted 3 lines

- looks like shell backticks in /etc/default/grub are not evaluated or I missed it. Only normal shell quoting is interpreted.

There are 2 routines for loading config: Use sh helper or read directly. We use sh helper when on unix-like OS and sh is available.

Quoted 3 lines

- I guess before merging obsolete shell commands should be removed? They are still present.

Yes, it's to avoid messing with conflicts in deleted files. They'll be removed in merge

Quoted 7 lines

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#7 lore raw

В Sun, 10 Nov 2013 16:38:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 11 lines · Andrey Borzenkov
Quoted 10 lines

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

As was discussed before

Quoted 8 lines
Quoted 6 lines

- shell grub-istall provides relatively easy way to track what is done (which modules are selected etc). Binary grub-install does not. It was suggested to enable easy access to this information (like echoing invocations of grub-mkimage and grub-setup). This is missing currently.

I added it. Is the one I added enough?

Yes, thank you. May be having basic verbose level that just prints them would be better, but that's something that can be implemented later.

Quoted 5 lines
Quoted 3 lines

- looks like shell backticks in /etc/default/grub are not evaluated or I missed it. Only normal shell quoting is interpreted.

There are 2 routines for loading config: Use sh helper or read directly. We use sh helper when on unix-like OS and sh is available.

Yes, I missed it.

Quoted 14 lines
Quoted 3 lines

- I guess before merging obsolete shell commands should be removed? They are still present.

Yes, it's to avoid messing with conflicts in deleted files. They'll be removed in merge

Quoted 7 lines

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#8 lore raw
In reply to Vladimir 'φ-coder/phcoder' Serbinenko

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

Hmm ... I noticed that you set quite a number of options as OPTION_HIDDEN. That is fine, they are not meant for everyday use, but how should users become aware of them? Read the source is not really the option here (oops, pun unintended). They are not documented in grub.info either.

I hoped arpg provides some way to show them (--help-all or similar) but apparently not.

Those options were shown before so it can be considered regression.

Any ideas how to handle this?

#9 lore raw
Quoted 14 lines · Andrey Borzenkov

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

Hmm ... I noticed that you set quite a number of options as OPTION_HIDDEN. That is fine, they are not meant for everyday use, but how should users become aware of them? Read the source is not really the option here (oops, pun unintended). They are not documented in grub.info either.

Quoted 7 lines

I hoped arpg provides some way to show them (--help-all or similar) but apparently not.

Those options were shown before so it can be considered regression.

Any ideas how to handle this?

The removed options is because instead of using external tools grub-* the C version simply links with appropriate C files and uses functions directly and so gets away with trouble of locating binaries.

Quoted 7 lines

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#10 lore raw
In reply to Andrey Borzenkov
Quoted 14 lines · Andrey Borzenkov

В Sat, 09 Nov 2013 13:51:09 +0100
Vladimir 'φ-coder/phcoder' Serbinenko <[email protected]> пишет:

Quoted 4 lines

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

Hmm ... I noticed that you set quite a number of options as OPTION_HIDDEN. That is fine, they are not meant for everyday use, but how should users become aware of them? Read the source is not really the option here (oops, pun unintended). They are not documented in grub.info either.

Quoted 7 lines

I hoped arpg provides some way to show them (--help-all or similar) but apparently not.

Those options were shown before so it can be considered regression.

Any ideas how to handle this?

I added --no-bootsector for skipping grub-setup stage and accept incredible arguments to grub-setup as synonym to --no-bootsector

Quoted 7 lines

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#11 lore raw
In reply to Vladimir 'φ-coder/phcoder' Serbinenko
Quoted 3 lines · Vladimir 'φ-coder/phcoder' Serbinenko

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

I just realized that the option --grub-mkimage is now accepted silently without having any effect in util/grub-install-common.c:grub_install_parse(). This makes it no longer feasible to easily wrap the mkimage command. While most of the meaningful reasons to wrap grub-mkimage have now been added to grub-install, I've run into something I'm struggling to work around: How do I add custom contents to a load.cfg, since util/grub-install.c seems to unconditionally grub_util_unlink(load_cfg)?

As a second concern, I think it is more appropriate that passing --grub-mkimage to grub-install is now an error. Existing scripts that use that argument presumably do so for a reason, and it has taken me longer than I would have liked to invest to root cause why my wrapper was not being invoked. I'll follow up with a (tiny) patch.

Thanks,
-Jon

#12 lore raw
Quoted 8 lines · Jonathan McCune
Quoted 4 lines · Vladimir 'φ-coder/phcoder' Serbinenko

Hello, all. install_c is feature complete and I intent to make it upstream unless issues are raised until 16 Nov. It's available under
http://git.savannah.gnu.org/cgit/grub.git/log/?h=phcoder/install_c

Quoted 9 lines

I just realized that the option --grub-mkimage is now accepted silently without having any effect in util/grub-install-common.c:grub_install_parse(). This makes it no longer feasible to easily wrap the mkimage command. While most of the meaningful reasons to wrap grub-mkimage have now been added to grub-install, I've run into something I'm struggling to work around: How do I add custom contents to a load.cfg, since util/grub-install.c seems to unconditionally grub_util_unlink(load_cfg)?

Could you provide examples of your grub.cfg usage? I think we need to have more real-life use cases to understand better how and when it is used.

Quoted 18 lines

As a second concern, I think it is more appropriate that passing --grub-mkimage to grub-install is now an error. Existing scripts that use that argument presumably do so for a reason, and it has taken me longer than I would have liked to invest to root cause why my wrapper was not being invoked. I'll follow up with a (tiny) patch.

Thanks,
-Jon

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel