aboutsummaryrefslogtreecommitdiff
path: root/mkcryptartix
diff options
context:
space:
mode:
authorHimbeerserverDE <himbeerserverde@gmail.com>2022-09-08 17:52:15 +0200
committerHimbeerserverDE <himbeerserverde@gmail.com>2022-09-08 17:52:15 +0200
commit750a08ef0317015b53d6f7f289acb28a8cb51a22 (patch)
tree244ff869c8bccbf4460096186815965603071de1 /mkcryptartix
parentf2e75a8f8b1f633778f401e04ebb86ac1d4891ac (diff)
Use installer keymap
Diffstat (limited to 'mkcryptartix')
-rwxr-xr-xmkcryptartix11
1 files changed, 9 insertions, 2 deletions
diff --git a/mkcryptartix b/mkcryptartix
index 0b9bd07..bfa21c3 100755
--- a/mkcryptartix
+++ b/mkcryptartix
@@ -2,6 +2,10 @@
set -e
+function get_cmdline {
+ sed -r 's/[[:alnum:]]+=/\n&/g' file | awk -F= '$1=="Var"{print $2}'
+}
+
DRIVE=$1
PART_PREFIX=$2
@@ -10,7 +14,8 @@ if [[ -z "${DRIVE}" ]] | [[ -z "${PART_PREFIX}" ]]; then
exit 1
fi
-ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
+TIMEZONE=$(get_cmdline tz)
+ln -sf "/usr/share/zoneinfo/${TIMEZONE}" /etc/localtime
hwclock --systohc
sed -i "s/#en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/" /etc/locale.gen
@@ -88,7 +93,9 @@ userdel ckbcomp
cp -p /tmp/ckbcomp-bin/pkg/ckbcomp-bin/usr/bin/ckbcomp /usr/local/bin/ckbcomp
-grub-kbdcomp -o /boot/grub/keymap.gkb de
+KEYMAP=$(get_cmdline keytable)
+
+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/i386-pc/core.img -O i386-pc -m /boot/grub/memdisk.tar disk biosdisk diskfilter luks2 part_msdos cryptodisk gcry_rijndael pbkdf2 gcry_sha256 ext2 memdisk tar at_keyboard keylayouts terminal