Skip to content

Commit

Permalink
mkosi: hook up i386 gpt pt types
Browse files Browse the repository at this point in the history
Let's actually hook up the i386 gpt pt types to be used.
  • Loading branch information
poettering committed Sep 8, 2021
1 parent 865a6a1 commit 7f68dcf
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions mkosi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ def gpt_root_native(arch: Optional[str], usr_only: bool = False) -> GPTRootTypeP
arch = platform.machine()

if usr_only:
if arch == "x86_64":
if arch in ("i386", "i486", "i586", "i686"):
return GPTRootTypePair(GPT_USR_X86, GPT_USR_X86_VERITY)
elif arch == "x86_64":
return GPTRootTypePair(GPT_USR_X86_64, GPT_USR_X86_64_VERITY)
elif arch == "aarch64":
return GPTRootTypePair(GPT_USR_ARM_64, GPT_USR_ARM_64_VERITY)
Expand All @@ -340,7 +342,9 @@ def gpt_root_native(arch: Optional[str], usr_only: bool = False) -> GPTRootTypeP
else:
die(f"Unknown architecture {arch}.")
else:
if arch == "x86_64":
if arch in ("i386", "i486", "i586", "i686"):
return GPTRootTypePair(GPT_ROOT_X86, GPT_ROOT_X86_VERITY)
elif arch == "x86_64":
return GPTRootTypePair(GPT_ROOT_X86_64, GPT_ROOT_X86_64_VERITY)
elif arch == "aarch64":
return GPTRootTypePair(GPT_ROOT_ARM_64, GPT_ROOT_ARM_64_VERITY)
Expand Down

0 comments on commit 7f68dcf

Please sign in to comment.