From 49a0e028ad82844ca7b80affaebb0e8a3bf96b79 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Tue, 20 Oct 2020 18:26:55 +0200
Subject: [PATCH 1/2] installer: support BOOT_IMAGE and SYSTEM_IMAGE boot
 options

---
 packages/tools/installer/scripts/installer | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer
index 1ec9905ac1..3c0ea3956c 100755
--- a/packages/tools/installer/scripts/installer
+++ b/packages/tools/installer/scripts/installer
@@ -261,10 +261,10 @@ do_install_quick() {
 
     # install system files
     msg_progress_install "60" "Installing Kernel"
-    cp /flash/KERNEL $TMPDIR/part1 >> $LOGFILE 2>&1
+    cp "/flash/$IMAGE_KERNEL" $TMPDIR/part1/KERNEL >> $LOGFILE 2>&1
 
     msg_progress_install "65" "Installing System"
-    cp /flash/SYSTEM $TMPDIR/part1 >> $LOGFILE 2>&1
+    cp "/flash/$IMAGE_SYSTEM" $TMPDIR/part1/SYSTEM >> $LOGFILE 2>&1
     sync
 
     # configuring bootloader
@@ -462,6 +462,21 @@ LOGBACKUP="/flash/logs/$(date +%Y%m%d%H%M%S).log"
 export COLORTERM="1"
 export NEWT_COLORS="$WHIPTAIL_COLORS"
 
+IMAGE_KERNEL="KERNEL"
+IMAGE_SYSTEM="SYSTEM"
+for arg in $(cat /proc/cmdline); do
+  case $arg in
+    BOOT_IMAGE=*)
+      IMAGE_KERNEL="${arg#*=}"
+      [ "${IMAGE_KERNEL:0:1}" = "/" ] && IMAGE_KERNEL="${IMAGE_KERNEL:1}"
+      ;;
+    SYSTEM_IMAGE=*)
+      IMAGE_SYSTEM="${arg#*=}"
+      [ "${IMAGE_SYSTEM:0:1}" = "/" ] && IMAGE_SYSTEM="${IMAGE_SYSTEM:1}"
+      ;;
+  esac
+done
+
 # prepare temporary directory
 rm -rf $TMPDIR
 mkdir -p $TMPDIR

From 25fdeab3588baba57f53cb23a9509bcc52785992 Mon Sep 17 00:00:00 2001
From: mglae <mglmail@arcor.de>
Date: Tue, 20 Oct 2020 19:48:40 +0200
Subject: [PATCH 2/2] installer: suppress "Error: /dev/sda: unrecognised disk
 label" on empty disk

---
 packages/tools/installer/scripts/installer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer
index 3c0ea3956c..2491a84700 100755
--- a/packages/tools/installer/scripts/installer
+++ b/packages/tools/installer/scripts/installer
@@ -180,7 +180,7 @@ do_install_quick() {
   {
     # remove all partitions
     msg_progress_install "1" "Get all partitions $INSTALL_DEVICE"
-    get_partition $INSTALL_DEVICE
+    get_partition $INSTALL_DEVICE 2>>$LOGFILE
 
     msg_progress_install "5" "Wiping disk $INSTALL_DEVICE"
     dd if=/dev/zero of=$INSTALL_DEVICE bs=4096 count=1024 2>>$LOGFILE