PrawnOS-nonfree/patches-tested/do-not-force-GUID-partition-with-gpt-commandline-option.patch
SolidHal cad1891021 Address mmc issue
Added three patches to fix the mmc issue as described here:
https://github.com/SolidHal/Librean/issues/17
Source for the patches is the chrome os kernel. Links to
the commits can be found in the issue.

Locking into version 4.17.2 for the time being.

Better organized patches.
Added logic to only apply tested patches on fresh kernel.

Moved some debian build improvements in from my devsus
master branch, including switching from xfce to lxqt.

May be able to add option between the two in the future,
as the issue that led to switching DEs may have been with
the xorg video drivers that are now skipped by the script
and not xfce itself.

Cleaned up uneeded old configs
2018-08-23 14:43:20 -05:00

28 lines
783 B
Diff

diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index dc51f46..4bf0f97 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -112,7 +112,11 @@
static int __init
force_gpt_fn(char *str)
{
- force_gpt = 1;
+ /* Do not force GPT even if 'gpt' command line option is
+ * specified for ChromeOS kernel.
+ */
+ force_gpt = 0;
+ pr_warn("Not forcing GPT even though 'gpt' specified on cmd line.\n");
return 1;
}
__setup("gpt", force_gpt_fn);
@@ -623,7 +627,7 @@
good_agpt = is_gpt_valid(state,
le64_to_cpu(pgpt->alternate_lba),
&agpt, &aptes);
- if (!good_agpt && force_gpt)
+ if (!good_agpt && force_gpt)
good_agpt = is_gpt_valid(state, lastlba, &agpt, &aptes);
/* The obviously unsuccessful case */