Revert "uki: Drop custom logic for discoverable partitions"

This is not yet properly supported in kiwi.

This reverts commit 571f7e79d4b627f93034f081d891fb06afff74bb.

1 files changed, 11 insertions, 2 deletions

diff --git a/uki-editbootconfig.sh b/uki-editbootconfig.sh
index 32cb463..6e35820 100755
--- a/uki-editbootconfig.sh
+++ b/uki-editbootconfig.sh
@@ -3,8 +3,8 @@ echo "###" "$0" "$@"
 
 # set arch-specific variables
 case "$(uname -m)" in
-    aarch64) arch="aa64"; ARCH="AA64";;
-    x86_64)  arch="x64";  ARCH="X64";;
+    aarch64) arch="aa64"; ARCH="AA64"; uuid="b921b045-1df0-41c3-af44-4c6f280d3fae"; rootfs="2";;
+    x86_64)  arch="x64";  ARCH="X64";  uuid="4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709"; rootfs="3";;
 esac
 
 # figure where shim.efi and BOOT.CSV are located
@@ -25,6 +25,15 @@ for uki in lib/modules/*/vmlinuz*.efi; do
         | iconv -f utf-8 -t ucs-2le >> "$csv"
 done
 
+# kiwi doesn't setup discoverable partitions, so fixup after the fact
+# here.  The UKI depends on that to find the root filesystem.
+#  * The image is loop-mounted, partitions:
+#    - biosboot (on x86 only, can this be disabled?).
+#    - EFI ESP.
+#    - root filesystem (this needs fixup).
+echo "# hack: rootfs: $uuid"
+sfdisk --part-type /dev/loop0 "$rootfs" "$uuid"
+
 # bz2240989: shim has a hard dependency on grub.  grub has a hard
 # dependency on dracut.  Ideally we would simply not install
 # grub+dracut, but given we can't until the shim bug is fixed disable