From 51d40ae6f434df66b2a748fa294e5766e92fae5c Mon Sep 17 00:00:00 2001
From: fewtarius <fewtarius@jelos.org>
Date: Tue, 31 May 2022 08:45:33 -0400
Subject: [PATCH] Fix RG552 boot.

---
 packages/sysutils/busybox/scripts/init |  6 +++---
 scripts/mkimage                        | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/sysutils/busybox/scripts/init b/packages/sysutils/busybox/scripts/init
index de1b4076c..7dd449416 100755
--- a/packages/sysutils/busybox/scripts/init
+++ b/packages/sysutils/busybox/scripts/init
@@ -496,11 +496,11 @@ load_splash() {
       fi
 
       if [ -n "$SPLASHIMAGE" -a -f "$SPLASHIMAGE" ]; then
-	if [ "${SPLASH_LOADER}" = "plymouth" ]
+	if [ "${SPLASH_LOADER}" = "imagemagick" ]
 	then
-          ply-image ${SPLASHIMAGE} > /dev/null 2>&1
+	  convert "${SPLASHIMAGE}" -background black -gravity center bgra:/dev/fb0
 	else
-	  convert "${SPLASHIMAGE}" -background black -gravity center bgra:/dev/fb0 > /dev/null 2>&1 
+          ply-image ${SPLASHIMAGE} > /dev/null 2>&1
 	fi
       fi
 
diff --git a/scripts/mkimage b/scripts/mkimage
index 0bf0cae07..7352bba8d 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -71,18 +71,26 @@ fi
 echo "image: creating part1..."
 SYSTEM_PART_END=$(( ${SYSTEM_PART_START} + (${SYSTEM_SIZE} * 1024 * 1024 / 512) - 1 ))
 if [ "${PARTITION_TABLE}" = "gpt" ]; then
+  echo "image: Create boot partition."
   parted -s "${DISK}" -a min unit s mkpart boot fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END}
 else
+  echo "image: Create primary partition."
   parted -s "${DISK}" -a min unit s mkpart primary fat32 ${SYSTEM_PART_START} ${SYSTEM_PART_END}
 fi
 parted -s "${DISK}" set 1 boot on
 sync
 
 # create part2
-echo "image: creating system partition..."
+echo "image: creating part2..."
 STORAGE_PART_START=$(( ${SYSTEM_PART_END} + 1 ))
 STORAGE_PART_END=$(( ${STORAGE_PART_START} + (${STORAGE_SIZE} * 1024 * 1024 / 512) - 1 ))
-parted -s "${DISK}" -a min unit s mkpart primary ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
+if [ "${DISK_LABEL}" = "gpt" ]; then
+    echo "image: Create storage partition."
+    parted -s "${DISK}" -a min unit s mkpart storage ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
+  else
+    echo "image: Create primary partition."
+    parted -s "${DISK}" -a min unit s mkpart primary ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
+fi
 sync
 
 # create filesystem on part1