openmamba/usbinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usbinstall.sh: fix for additional command line arguments for livedvd multilanguage boot lost during isolinux to grub cfg conversion

Browse Source
This commit is contained in:
Silvan Calarco 2019-12-21 15:17:37 +01:00
parent 7eb7060a0c
commit 2992551aad
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/usbinstall.sh
View File

@ -321,6 +321,8 @@ else
mkdir LiveOS boot rwroot ovlwork mkdir LiveOS boot rwroot ovlwork
cp $ISOMOUNTDIR/boot/{initrd*,vmlinuz*} boot/ 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..." set_status $"Copying SquashFS image from ISO image..."
echo $"Copying SquashFS image..." echo $"Copying SquashFS image..."
@ -385,7 +387,7 @@ search --no-floppy --label --set=root openmamba_live
esac esac
done < $ISOMOUNTDIR/boot/isolinux/isolinux.cfg done < $ISOMOUNTDIR/boot/isolinux/isolinux.cfg
[ "$CURR_BRACKET_OPEN" = "1" ] && echo "}" >> $MOUNTDIR_EFI/EFI/BOOT/grub.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 mkdir boot/grub
cp $MOUNTDIR_EFI/EFI/BOOT/grub.cfg boot/grub/grub.cfg cp $MOUNTDIR_EFI/EFI/BOOT/grub.cfg boot/grub/grub.cfg
@ -395,13 +397,11 @@ fi
set_pbar 85 set_pbar 85
cp -a $MOUNTDIR_EFI/EFI $MOUNTDIR_EFI_MAC 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 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 hfs-bless $MOUNTDIR_EFI_MAC/EFI/BOOT/bootx64.efi &>>$LOGFILE
else
hfs-bless $MOUNTDIR_EFI_MAC/EFI/BOOT/bootia32.efi &>>$LOGFILE
fi fi
set_status $"Writing bootloader..." set_status $"Writing bootloader..."