From c3183eed1e6ab4ac8a7bf7dcb387876d56ce910b Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 9 Feb 2022 14:00:29 +0100
Subject: [PATCH] progress

---
 etc/base            |  3 +++
 etc/bootloader/grub | 40 +++++++++++++++++++++-------------------
 main.sh             |  2 +-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/etc/base b/etc/base
index 6193e65..4dc4391 100644
--- a/etc/base
+++ b/etc/base
@@ -1,6 +1,9 @@
 packages() {
 	addpkg base-system sudo void-repo-multilib void-repo-multilib-nonfree void-repo-nonfree lvm2 cronie socklog-void ntp xtools wireguard-tools gnupg progress pwgen net-tools ncdu nmap mtr bind-utils iotop hdparm smartmontools htop git neovim btrbk croc grub-btrfs nano mbuffer cryptsetup psmisc pinentry-tty pciutils iproute2 iputils iperf unzip usbutils wget
 	ignorepkg nvi
+	if [ "${EFI}" == "1" ]; then
+		addpkg ckbcomp
+	fi
 }
 
 config() {
diff --git a/etc/bootloader/grub b/etc/bootloader/grub
index 0af73f4..ebd503c 100644
--- a/etc/bootloader/grub
+++ b/etc/bootloader/grub
@@ -27,28 +27,30 @@ config() {
 	fi
 	
 	if ! [ "${KEY_LANG}" == "en" ]; then
-		VGUUID=$(vgdisplay |grep UUID|awk '{print $3}')
-		LVUUID=$(lvdisplay ${TARGETNAME_UNDERSCORE}-root |grep UUID|awk '{print $3}')
-		rl=$(basename $(readlink "${TARGET_PHY_ID}-part${TARGET_PART}"))
-		TMP=$(lsblk -o NAME,UUID -l|grep "${rl}" | awk '{print $2}')
-		CRYPTUUID=${TMP//-/}
-		grub-kbdcomp -o ${KEY_LANG}.gkb ${KEY_LANG}
-		tar cf memdisk.tar ${KEY_LANG}.gkb
+		if [ "${EFI}" == "1" ]; then
+			VGUUID=$(vgdisplay |grep UUID|awk '{print $3}')
+			LVUUID=$(lvdisplay ${TARGETNAME_UNDERSCORE}-root |grep UUID|awk '{print $3}')
+			rl=$(basename $(readlink "${TARGET_PHY_ID}-part${TARGET_PART}"))
+			TMP=$(lsblk -o NAME,UUID -l|grep "${rl}" | awk '{print $2}')
+			CRYPTUUID=${TMP//-/}
+			grub-kbdcomp -o ${KEY_LANG}.gkb ${KEY_LANG}
+			tar cf memdisk.tar ${KEY_LANG}.gkb
 
-		echo "set root=(memdisk)" >> /boot/grub/early-grub.cfg
-		echo "set prefix=($root)/" >> /boot/grub/early-grub.cfg
-		echo "terminal_input at_keyboard" >> /boot/grub/early-grub.cfg
-		echo "keymap /dvorak.gkb" >> /boot/grub/early-grub.cfg
-		echo "cryptomount -u 1234abcdef1234abcdef1234abcdef" >> /boot/grub/early-grub.cfg
-		echo "set root='cryptouuid/1234abcdef1234abcdef1234abcdef'" >> /boot/grub/early-grub.cfg
-		echo "set prefix=($root)/grub" >> /boot/grub/early-grub.cfg
-		echo "configfile grub.cfg" >> /boot/grub/early-grub.cfg
+			echo "set root=(memdisk)" >> /boot/grub/early-grub.cfg
+			echo "set prefix=($root)/" >> /boot/grub/early-grub.cfg
+			echo "terminal_input at_keyboard" >> /boot/grub/early-grub.cfg
+			echo "keymap /dvorak.gkb" >> /boot/grub/early-grub.cfg
+			echo "cryptomount -u 1234abcdef1234abcdef1234abcdef" >> /boot/grub/early-grub.cfg
+			echo "set root='cryptouuid/1234abcdef1234abcdef1234abcdef'" >> /boot/grub/early-grub.cfg
+			echo "set prefix=($root)/grub" >> /boot/grub/early-grub.cfg
+			echo "configfile grub.cfg" >> /boot/grub/early-grub.cfg
 
-		mkdir -p /boot/grub/
-		grub-mkimage -c /boot/grub/early-grub.cfg -o grubx64.efi -O x86_64-efi -m memdisk.tar memdisk tar at_keyboard keylayouts configfile
-		cp -f grubx64.efi /boot/efi/EFI/void/grubx64.efi
+			mkdir -p /boot/grub/
+			grub-mkimage -c /boot/grub/early-grub.cfg -o grubx64.efi -O x86_64-efi -m memdisk.tar memdisk tar at_keyboard keylayouts configfile
+			cp -f grubx64.efi /boot/efi/EFI/void/grubx64.efi
 
-		rm -rf grubx64.efi memdisk.tar ${KEY_LANG}.gkb
+			rm -rf grubx64.efi memdisk.tar ${KEY_LANG}.gkb
+		fi
 		if ! grep -q rd.console.keymap /etc/default/grub; then
 	        sed -i "/^GRUB_CMDLINE_LINUX_DEFAULT/s/=\"/=\" rd.vconsole.keymap=${L2} /" /etc/default/grub
 		fi
diff --git a/main.sh b/main.sh
index 6967074..49cf85a 100755
--- a/main.sh
+++ b/main.sh
@@ -320,7 +320,7 @@ do_chroot() {
 
 cat <<EOF > "${target}/tmp/vinstaller/main_chroot"
 #!/usr/bin/bash
-
+cd /tmp/vinstaller
 FILESDIR=/tmp/vinstaller/files
 
 . /tmp/vinstaller/functions