summaryrefslogtreecommitdiff
path: root/user/horizon/ppc32-apm.patch
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2024-12-21 19:31:39 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2024-12-21 19:31:39 -0600
commitf12a665e59888b30042c8c3d0ce9545fc52ceea8 (patch)
tree495069ae5cb25aebd07166503cce1a3ace10dd6a /user/horizon/ppc32-apm.patch
parent98264c3e6fa550a221317a931aeec048eebd01cd (diff)
downloadpackages-f12a665e59888b30042c8c3d0ce9545fc52ceea8.tar.gz
packages-f12a665e59888b30042c8c3d0ce9545fc52ceea8.tar.bz2
packages-f12a665e59888b30042c8c3d0ce9545fc52ceea8.tar.xz
packages-f12a665e59888b30042c8c3d0ce9545fc52ceea8.zip
user/horizon: Add upstream patch for PPC32 disks
This is required to partition PPC32 disks correctly when blank. Otherwise, users will face the dreaded error: ``` /etc/horizon/installfile:8: error: partition: consistency error on /dev/sda: Partition #1 has been requested, but the disk has 1 partitions ``` This fixes that issue.
Diffstat (limited to 'user/horizon/ppc32-apm.patch')
-rw-r--r--user/horizon/ppc32-apm.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/user/horizon/ppc32-apm.patch b/user/horizon/ppc32-apm.patch
new file mode 100644
index 000000000..caa5d3189
--- /dev/null
+++ b/user/horizon/ppc32-apm.patch
@@ -0,0 +1,29 @@
+From 02bab111a473e6bc45c4c95e8f17634b42e0fba9 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sat, 21 Dec 2024 19:18:53 -0600
+Subject: [PATCH] Qt UI: Count APM partitions correctly on PPC32
+
+The fix we did in 5df1abdb74 is not complete; we use APM on 32-bit
+PowerPC machines as well. We need to do the same workaround on PPC32
+that we do on PPC64 Power Macs.
+
+Fixes: 5df1abdb74 ("Qt UI: Fix partition count for APM disklabel")
+---
+ ui/qt5/horizonwizard.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc
+index 81ddcdc..9cc0690 100644
+--- a/ui/qt5/horizonwizard.cc
++++ b/ui/qt5/horizonwizard.cc
+@@ -409,6 +409,7 @@ QStringList eraseDiskForArch(const std::string &raw_disk,
+ case HorizonWizard::x86_64: /* 64-bit Intel uses GPT */
+ return {QString{"disklabel %1 gpt"}.arg(disk)};
+ case HorizonWizard::ppc: /* 32-bit PowerPC: we only support Power Mac */
++ (*start)++;
+ return {QString{"disklabel %1 apm"}.arg(disk)};
+ case HorizonWizard::ppc64: /* Complicated */
+ switch(subarch) {
+--
+2.40.0
+