7922aff076
OBS-URL: https://build.opensuse.org/request/show/743954 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=212
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
Index: grub-2.04~rc1/grub-core/kern/ieee1275/cmain.c
|
|
===================================================================
|
|
--- grub-2.04~rc1.orig/grub-core/kern/ieee1275/cmain.c
|
|
+++ grub-2.04~rc1/grub-core/kern/ieee1275/cmain.c
|
|
@@ -90,7 +90,10 @@ grub_ieee1275_find_options (void)
|
|
}
|
|
|
|
if (rc >= 0 && grub_strncmp (tmp, "IBM", 3) == 0)
|
|
- grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
|
|
+ {
|
|
+ grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_NO_TREE_SCANNING_FOR_DISKS);
|
|
+ grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT);
|
|
+ }
|
|
|
|
/* Old Macs have no key repeat, newer ones have fully working one.
|
|
The ones inbetween when repeated key generates an escaoe sequence
|
|
Index: grub-2.04~rc1/grub-core/video/ieee1275.c
|
|
===================================================================
|
|
--- grub-2.04~rc1.orig/grub-core/video/ieee1275.c
|
|
+++ grub-2.04~rc1/grub-core/video/ieee1275.c
|
|
@@ -352,9 +352,12 @@ static struct grub_video_adapter grub_vi
|
|
|
|
GRUB_MOD_INIT(ieee1275_fb)
|
|
{
|
|
- find_display ();
|
|
- if (display)
|
|
- grub_video_register (&grub_video_ieee1275_adapter);
|
|
+ if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT))
|
|
+ {
|
|
+ find_display ();
|
|
+ if (display)
|
|
+ grub_video_register (&grub_video_ieee1275_adapter);
|
|
+ }
|
|
}
|
|
|
|
GRUB_MOD_FINI(ieee1275_fb)
|
|
Index: grub-2.04~rc1/include/grub/ieee1275/ieee1275.h
|
|
===================================================================
|
|
--- grub-2.04~rc1.orig/include/grub/ieee1275/ieee1275.h
|
|
+++ grub-2.04~rc1/include/grub/ieee1275/ieee1275.h
|
|
@@ -148,6 +148,8 @@ enum grub_ieee1275_flag
|
|
GRUB_IEEE1275_FLAG_CURSORONOFF_ANSI_BROKEN,
|
|
|
|
GRUB_IEEE1275_FLAG_RAW_DEVNAMES,
|
|
+
|
|
+ GRUB_IEEE1275_FLAG_DISABLE_VIDEO_SUPPORT
|
|
};
|
|
|
|
extern int EXPORT_FUNC(grub_ieee1275_test_flag) (enum grub_ieee1275_flag flag);
|