Bug#767037: Grub EFI fallback - patches for review
Steve McIntyre
steve at einval.com
Wed Dec 3 01:55:38 UTC 2014
On Tue, Dec 02, 2014 at 08:36:31AM +0000, Ian Campbell wrote:
>On Mon, 2014-12-01 at 13:57 +0000, Steve McIntyre wrote:
>
>Starting with grub-install-fallback.patch:
>
>> >From e384e597914b6e1b1dcbf96ef6782cf9bcc2313b Mon Sep 17 00:00:00 2001
>> debian/patches/grub-install-extra-removable.patch | 115 ++++++++++++++++++++++
>
>Could you send this to grub-devel at gnu.org? Or at least provide a commit
>log for the upstream bit inline in the patch for whoever does end up
>forwarding it.
Sure, no problem. I've added a header for now. As my stuff is
intermingled with other changes in the Debian tree, I'm not sure how
well that will work upstream...
>> +@@ -829,6 +838,27 @@ fill_core_services (const char *core_ser
>> + free (sysv_plist);
>> + }
>> +
>> ++static void
>> ++also_install_removable(const char *src, const char *base_efidir, const char *efi_suffix_upper)
>> ++{
>> ++ char *efi_file = NULL;
>> ++ char *dst = NULL;
>> ++ char *dir = NULL;
>> ++
>> ++ if (!efi_suffix_upper)
>> ++ grub_util_error ("%s", _("You've found a bug"));
>
>There are one or two of these in the upstream code base already, but it
>is a bit unfriendly to the bug-reported/triagger.
>
>I see an existing instance of
> _("you found a bug ... (%s:%d)\n"), file, line)
>which is a bit nicer at least. Plain old assert() sees some usage too.
OK. Again, I was just following the surrounding (grotty) style. :-)
I'll tweak.
>The Debian-specific bits all look sensible to me, FWIW. There will be a
>minor conflict with the patches in #770412 but nothing insurmountable.
Cool, ta!
>> [...]
>> + also depend on this path. If so, uou will need to ensure that GRUB is
>
>Typo: "uou".
ACK, already fixed after KiBi's feedback.
Rebased patch V2 against current git master attached...
--
Steve McIntyre, Cambridge, UK. steve at einval.com
"The problem with defending the purity of the English language is that
English is about as pure as a cribhouse whore. We don't just borrow words; on
occasion, English has pursued other languages down alleyways to beat them
unconscious and rifle their pockets for new vocabulary." -- James D. Nicoll
-------------- next part --------------
A non-text attachment was scrubbed...
Name: grub-install-fallback-V2.patch
Type: text/x-diff
Size: 8821 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-grub-devel/attachments/20141203/a3343c2a/attachment-0002.patch>
More information about the Pkg-grub-devel
mailing list