mirror of
https://github.com/Le0xFF/VoidLinuxInstaller.git
synced 2024-09-11 18:47:17 +03:00
Finally fix kdfontop.c error
This commit is contained in:
parent
fb03a19e05
commit
f4ee8c85ec
@ -157,7 +157,7 @@ EOF
|
|||||||
sed -i "/#KEYMAP=/s/.*/KEYMAP=\"$user_keyboard_layout\"/" /etc/rc.conf
|
sed -i "/#KEYMAP=/s/.*/KEYMAP=\"$user_keyboard_layout\"/" /etc/rc.conf
|
||||||
echo -e -n "\nKeyboard layout set to: ${BLUE_LIGHT}$user_keyboard_layout${NORMAL}.\n"
|
echo -e -n "\nKeyboard layout set to: ${BLUE_LIGHT}$user_keyboard_layout${NORMAL}.\n"
|
||||||
echo -e -n "\nSetting keymap in dracut configuration and regenerating initramfs...\n\n"
|
echo -e -n "\nSetting keymap in dracut configuration and regenerating initramfs...\n\n"
|
||||||
echo -e "i18n_vars=\"/etc/rc.conf:KEYMAP\ni18n_install_all=\"no\"\"" >>/etc/dracut.conf.d/i18n.conf
|
echo -e "i18n_vars=\"/etc/rc.conf:KEYMAP\"\ni18n_install_all=\"no\"" >>/etc/dracut.conf.d/i18n.conf
|
||||||
press_any_key_to_continue
|
press_any_key_to_continue
|
||||||
echo
|
echo
|
||||||
dracut --regenerate-all --force --hostonly
|
dracut --regenerate-all --force --hostonly
|
||||||
@ -169,9 +169,6 @@ EOF
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set console font to avoid kdfontop.c errors
|
|
||||||
sed -i "/#FONT=/s/^#//" /etc/rc.conf
|
|
||||||
|
|
||||||
# Set hostname
|
# Set hostname
|
||||||
while true; do
|
while true; do
|
||||||
header_ic
|
header_ic
|
||||||
@ -309,6 +306,11 @@ function install_bootloader {
|
|||||||
|
|
||||||
elif [[ $bootloader =~ $regex_GRUB2 ]]; then
|
elif [[ $bootloader =~ $regex_GRUB2 ]]; then
|
||||||
echo -e -n "\nBootloader selected: ${BLUE_LIGHT}$bootloader${NORMAL}.\n"
|
echo -e -n "\nBootloader selected: ${BLUE_LIGHT}$bootloader${NORMAL}.\n"
|
||||||
|
|
||||||
|
# Fix kdfontop.c error
|
||||||
|
# https://github.com/torvalds/linux/blob/master/Documentation/fb/fbcon.rst
|
||||||
|
sed -i "/GRUB_CMDLINE_LINUX_DEFAULT=/s/\"$/ fbcon=nodefer&/" /etc/default/grub
|
||||||
|
|
||||||
if [[ $encryption_yn =~ $regex_YES ]]; then
|
if [[ $encryption_yn =~ $regex_YES ]]; then
|
||||||
echo -e -n "\nEnabling CRYPTODISK in GRUB...\n"
|
echo -e -n "\nEnabling CRYPTODISK in GRUB...\n"
|
||||||
echo -e -n "\nGRUB_ENABLE_CRYPTODISK=y\n" >>/etc/default/grub
|
echo -e -n "\nGRUB_ENABLE_CRYPTODISK=y\n" >>/etc/default/grub
|
||||||
|
10
vli.sh
10
vli.sh
@ -289,7 +289,7 @@ EOF
|
|||||||
sed -i "/#KEYMAP=/s/.*/KEYMAP=\"$user_keyboard_layout\"/" /etc/rc.conf
|
sed -i "/#KEYMAP=/s/.*/KEYMAP=\"$user_keyboard_layout\"/" /etc/rc.conf
|
||||||
echo -e -n "\nKeyboard layout set to: ${BLUE_LIGHT}$user_keyboard_layout${NORMAL}.\n"
|
echo -e -n "\nKeyboard layout set to: ${BLUE_LIGHT}$user_keyboard_layout${NORMAL}.\n"
|
||||||
echo -e -n "\nSetting keymap in dracut configuration and regenerating initramfs...\n\n"
|
echo -e -n "\nSetting keymap in dracut configuration and regenerating initramfs...\n\n"
|
||||||
echo -e "i18n_vars=\"/etc/rc.conf:KEYMAP\ni18n_install_all=\"no\"\"" >>/etc/dracut.conf.d/i18n.conf
|
echo -e "i18n_vars=\"/etc/rc.conf:KEYMAP\"\ni18n_install_all=\"no\"" >>/etc/dracut.conf.d/i18n.conf
|
||||||
press_any_key_to_continue
|
press_any_key_to_continue
|
||||||
echo
|
echo
|
||||||
dracut --regenerate-all --force --hostonly
|
dracut --regenerate-all --force --hostonly
|
||||||
@ -301,9 +301,6 @@ EOF
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Set console font to avoid kdfontop.c errors
|
|
||||||
sed -i "/#FONT=/s/^#//" /etc/rc.conf
|
|
||||||
|
|
||||||
# Set hostname
|
# Set hostname
|
||||||
while true; do
|
while true; do
|
||||||
header_ic
|
header_ic
|
||||||
@ -441,6 +438,11 @@ function install_bootloader {
|
|||||||
|
|
||||||
elif [[ $bootloader =~ $regex_GRUB2 ]]; then
|
elif [[ $bootloader =~ $regex_GRUB2 ]]; then
|
||||||
echo -e -n "\nBootloader selected: ${BLUE_LIGHT}$bootloader${NORMAL}.\n"
|
echo -e -n "\nBootloader selected: ${BLUE_LIGHT}$bootloader${NORMAL}.\n"
|
||||||
|
|
||||||
|
# Fix kdfontop.c error
|
||||||
|
# https://github.com/torvalds/linux/blob/master/Documentation/fb/fbcon.rst
|
||||||
|
sed -i "/GRUB_CMDLINE_LINUX_DEFAULT=/s/\"$/ fbcon=nodefer&/" /etc/default/grub
|
||||||
|
|
||||||
if [[ $encryption_yn =~ $regex_YES ]]; then
|
if [[ $encryption_yn =~ $regex_YES ]]; then
|
||||||
echo -e -n "\nEnabling CRYPTODISK in GRUB...\n"
|
echo -e -n "\nEnabling CRYPTODISK in GRUB...\n"
|
||||||
echo -e -n "\nGRUB_ENABLE_CRYPTODISK=y\n" >>/etc/default/grub
|
echo -e -n "\nGRUB_ENABLE_CRYPTODISK=y\n" >>/etc/default/grub
|
||||||
|
Loading…
Reference in New Issue
Block a user