From 2992551aadc67f922887c01eebaaddc057b576fb Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 21 Dec 2019 15:17:37 +0100
Subject: [PATCH] usbinstall.sh: fix for additional command line arguments for
 livedvd multilanguage boot lost during isolinux to grub cfg conversion

---
 src/usbinstall.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/usbinstall.sh b/src/usbinstall.sh
index 15f802d..1d9186c 100644
--- a/src/usbinstall.sh
+++ b/src/usbinstall.sh
@@ -321,6 +321,8 @@ else
 
    mkdir LiveOS boot rwroot ovlwork
    cp $ISOMOUNTDIR/boot/{initrd*,vmlinuz*} boot/
+   TARGET_ARCH=`cat $ISOMOUNTDIR/etc/openmamba-release | sed "s|.*for \(.*\) .*|\1|"`
+   [ "$TARGET_ARCH" ] || TARGET_ARCH=x86_64
 
    set_status $"Copying SquashFS image from ISO image..."
    echo $"Copying SquashFS image..."
@@ -385,7 +387,7 @@ search --no-floppy --label --set=root openmamba_live
       esac
    done < $ISOMOUNTDIR/boot/isolinux/isolinux.cfg
    [ "$CURR_BRACKET_OPEN" = "1" ] && echo "}" >> $MOUNTDIR_EFI/EFI/BOOT/grub.cfg
-   sed -i "s|root=live:LABEL=.*|root=live:LABEL=openmamba_live rd.live.overlay=/dev/disk/by-label/openmamba_live:/rwroot selinux=0 quiet splash rw|" $MOUNTDIR_EFI/EFI/BOOT/grub.cfg
+   sed -i "s|root=live:LABEL=.*splash|root=live:LABEL=openmamba_live rd.live.overlay=/dev/disk/by-label/openmamba_live:/rwroot selinux=0 quiet splash rw|" $MOUNTDIR_EFI/EFI/BOOT/grub.cfg
 
    mkdir boot/grub
    cp $MOUNTDIR_EFI/EFI/BOOT/grub.cfg boot/grub/grub.cfg
@@ -395,13 +397,11 @@ fi
 set_pbar 85
 
 cp -a $MOUNTDIR_EFI/EFI $MOUNTDIR_EFI_MAC
-TARGET_ARCH=`cat $MOUNTDIR/etc/openmamba-release | sed "s|.*for \(.*\) .*|\1|"`
-[ "$TARGET_ARCH" ] || ARCH=i586
 
 if [ "$TARGET_ARCH" = "x86_64" ]; then
-   hfs-bless $MOUNTDIR_EFI_MAC/EFI/BOOT/bootia32.efi &>>$LOGFILE
-else
    hfs-bless $MOUNTDIR_EFI_MAC/EFI/BOOT/bootx64.efi &>>$LOGFILE
+else
+   hfs-bless $MOUNTDIR_EFI_MAC/EFI/BOOT/bootia32.efi &>>$LOGFILE
 fi
 
 set_status $"Writing bootloader..."