Abandon ckbcomp

US only from now on. Custom bootloader is unlikely to ever happen. Closes #21, #11.

1 files changed, 0 insertions, 41 deletions

diff --git a/mkcryptartix b/mkcryptartix
index cc58a62..eb1da85 100755
--- a/mkcryptartix
+++ b/mkcryptartix
@@ -54,7 +54,6 @@ rc-update add dmcrypt boot
 UUID=$(blkid -s UUID -o value ${PART_PREFIX}2)
 sed -i "s/GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet\"/GRUB_CMDLINE_LINUX_DEFAULT=\"loglevel=3 quiet cryptdevice=UUID=${UUID}:root_crypt\"/" /etc/default/grub
 sed -i "s/#GRUB_ENABLE_CRYPTODISK=y/GRUB_ENABLE_CRYPTODISK=y/" /etc/default/grub
-sed -i "s/GRUB_TERMINAL_INPUT=console/GRUB_TERMINAL_INPUT=at_keyboard/" /etc/default/grub
 
 dd bs=512 count=4 if=/dev/random of=/crypto_keyfile.bin iflag=fullblock
 chmod 600 /crypto_keyfile.bin
@@ -67,46 +66,6 @@ grub-mkconfig -o /boot/grub/grub.cfg
 
 mkinitcpio -p linux
 
-# Enable GRUB to unlock /boot
-CRYPTO_UUID=$(blkid -s UUID -o value ${PART_PREFIX}1 | tr -d -)
-cat <<EOT > /boot/grub/grub-pre.cfg
-set root=(memdisk)
-set prefix=(\$root)/
-
-terminal_input at_keyboard
-keymap /keymap.gkb
-
-set crypto_uuid=${CRYPTO_UUID}
-cryptomount -u \$crypto_uuid
-
-set root=crypto0
-set prefix=(\$root)/grub
-
-insmod normal
-normal
-EOT
-
-pacman -S --needed --noconfirm libxkbcommon-x11 # XKB layouts
-
-useradd ckbcomp
-echo -en 'ckbcomp\nckbcomp' | passwd ckbcomp
-
-git clone https://aur.archlinux.org/ckbcomp-bin.git /tmp/ckbcomp-bin
-chown -R ckbcomp:ckbcomp /tmp/ckbcomp-bin
-(cd /tmp/ckbcomp-bin && su ckbcomp -c 'makepkg')
-
-userdel ckbcomp
-
-cp -p /tmp/ckbcomp-bin/pkg/ckbcomp-bin/usr/bin/ckbcomp /usr/local/bin/ckbcomp
-
-grub-kbdcomp -o /boot/grub/keymap.gkb ${KEYMAP}
-(cd /boot/grub && tar cf memdisk.tar keymap.gkb)
-
-grub-mkimage -p /boot/grub -c /boot/grub/grub-pre.cfg -o /boot/grub/${TARGET}/core.img -O ${TARGET} -m /boot/grub/memdisk.tar disk biosdisk diskfilter luks2 part_msdos cryptodisk gcry_rijndael pbkdf2 gcry_sha256 ext2 memdisk tar at_keyboard keylayouts terminal
-grub-bios-setup -d /boot/grub/${TARGET} ${DRIVE}
-
-pacman -Rns --noconfirm libxkbcommon-x11 # Not needed by all users
-
 echo -en 'artix\nartix' | passwd
 
 # Network