Fierelier/windvn
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Copy keyboard settings and don't reboot

Browse Source
This commit is contained in:
Fierelier 2022-11-07 01:53:04 +01:00
parent 8b06bb31c0
commit c12afc2827
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mods/live-installer/data/bin/login
View File

@ -187,6 +187,11 @@ $WDVN_ENCRYPT_PASS_ADD" | cryptsetup luksAddKey "$PART_DEV"
echo "UUID=$UUID_PART_DATA / ext4 errors=remount-ro 0 1" >>"/media/install/etc/fstab"
echo "/swap none swap sw 0 0" >>"/media/install/etc/fstab"
# Copy keyboard settings
echo "Copying keyboard settings ..."
mkdir -p "/media/install/etc/default"
cp "/etc/default/keyboard" "/media/install/etc/default/keyboard"
# Remove live-specific packages
echo "Removing live-specific packages ..."
wdvn-chroot "/media/install" apt -y remove live-boot live-boot-initramfs-tools

9
mods/oobe/data/bin/login
View File

@ -11,11 +11,6 @@ while true; do
echo ""
if [ "$CHOICE" == "1" ]; then
dpkg-reconfigure keyboard-configuration
service console-setup.sh restart
udevadm trigger --subsystem-match=input --action=change
service keyboard-setup.sh restart
apt -y install locales tzdata
dpkg-reconfigure locales
dpkg-reconfigure tzdata
@ -56,9 +51,9 @@ ff02::2 ip6-allrouters
rm "/bin/login"
mv "/bin/login.bak" "/bin/login"
echo "Setup complete. Press ENTER to reboot."
echo "Setup complete. Press ENTER to use windvn."
read -p ""
reboot
exit
fi
if [ "$CHOICE" == "2" ]; then