xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: error creating keyboard config in vm due to removal of xorg dir

Browse Source
This commit is contained in:
natemaia 2018-12-16 00:34:16 -08:00
parent 875b8738ba
commit f086d55071
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/boot.sh
View File

@ -217,7 +217,7 @@ EOF
install_bootloader() install_bootloader()
{ {
if ! [[ $ROOT_PART =~ /dev/mapper ]]; then if ! [[ $ROOT_PART =~ /dev/mapper ]]; then
if [[ $BOOTLDR == 'syslinux' && $SYS == 'BIOS' ]]; then if [[ $BOOTLDR == 'syslinux' ]]; then
ROOT_PART_ID="UUID=$(blkid -s UUID -o value $ROOT_PART)" ROOT_PART_ID="UUID=$(blkid -s UUID -o value $ROOT_PART)"
else else
ROOT_PART_ID="UUID=$(blkid -s PARTUUID -o value $ROOT_PART)" ROOT_PART_ID="UUID=$(blkid -s PARTUUID -o value $ROOT_PART)"
@ -227,6 +227,9 @@ install_bootloader()
ROOT_PART_ID="$ROOT_PART" ROOT_PART_ID="$ROOT_PART"
fi fi
# for virtual machine remove the ucode
[[ $VM ]] && UCODE=""
# remove old UEFI boot entries # remove old UEFI boot entries
if [[ $SYS == 'UEFI' ]]; then if [[ $SYS == 'UEFI' ]]; then
find ${MNT}${BMNTS[$SYS-$BOOTLDR]}/EFI/ \ find ${MNT}${BMNTS[$SYS-$BOOTLDR]}/EFI/ \

1
src/lib/install.sh
View File

@ -138,6 +138,7 @@ EOF
fi fi
# set the keymaps # set the keymaps
mkdir -p $MNT/etc/X11/xorg.conf.d
cat > $MNT/etc/X11/xorg.conf.d/00-keyboard.conf <<EOF cat > $MNT/etc/X11/xorg.conf.d/00-keyboard.conf <<EOF
# Use localectl(1) to instruct systemd-localed to update it. # Use localectl(1) to instruct systemd-localed to update it.
Section "InputClass" Section "InputClass"