diff --git a/custom-scripts/icewm_bodgemaster_env.sh b/custom-scripts/icewm_bodgemaster_env.sh index 84ce771..78ef8cd 100644 --- a/custom-scripts/icewm_bodgemaster_env.sh +++ b/custom-scripts/icewm_bodgemaster_env.sh @@ -73,7 +73,7 @@ echo '/usr/bin/env bash --login $HOME/.xinitrc' > /etc/skel/.xsession cp /usr/lib/X11/xdm/Xsetup_0 /etc/X11/xdm/ sed -i -e 's/.*xconsole.*/#&/' /etc/X11/xdm/Xsetup_0 # TODO: ask user for keyboard layout -echo "setxkbmap de" >> /etc/X11/xdm/Xsetup_0 +echo "setxkbmap us" >> /etc/X11/xdm/Xsetup_0 sed -i -e 's|DisplayManager._0.setup:.*|DisplayManager._0.setup: /etc/X11/xdm/Xsetup_0|' /etc/X11/xdm/xdm-config cat > /etc/skel/.bashrc << EOF diff --git a/install-stage1.sh b/install-stage1.sh index b38fe0f..bd45bc1 100644 --- a/install-stage1.sh +++ b/install-stage1.sh @@ -79,7 +79,7 @@ xbps-install --yes xmirror wget >> $LOGFILE 2>&1 echo "done" #TODO: Select keyboard layout by showing lists of what's present (directories for region, then files within) -KBD_LAYOUT="de-latin1" +KBD_LAYOUT="us" clear echo "Select the USB stick to install to (NAME column below)... diff --git a/opt/grub-config b/opt/grub-config index 333ea81..99b6554 100644 --- a/opt/grub-config +++ b/opt/grub-config @@ -18,7 +18,7 @@ else VOIDUSB_CONTAINER="UUID=$(blkid --output value --match-tag UUID "$VOIDUSB_CONTAINER")" fi # TODO: rd.vconsole.keymap -LINUX_CMDLINE="quiet root=/dev/loop0 ro $LUKS_SETTINGS void-usb-container=$VOIDUSB_CONTAINER rd.vconsole.keymap=de-latin1" +LINUX_CMDLINE="quiet root=/dev/loop0 ro $LUKS_SETTINGS void-usb-container=$VOIDUSB_CONTAINER rd.vconsole.keymap=us" DEFAULT_LINUX=$(find /boot -type l -name "vmlinu*" 2>/dev/null | sort | head -n1) DEFAULT_LINUX="$(sed 's|^/boot/||' <<< "$DEFAULT_LINUX")"