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

Lower case distro name for boot files

Browse Source
This commit is contained in:
natemaia 2020-11-04 16:23:10 -08:00
parent 204912e5c3
commit 89bb0a394a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
installer
View File

@ -234,7 +234,7 @@ declare -A EDIT_FILES=(
[console]='/etc/vconsole.conf' [console]='/etc/vconsole.conf'
[mkinitcpio]='/etc/mkinitcpio.conf' [mkinitcpio]='/etc/mkinitcpio.conf'
[hostname]='/etc/hostname /etc/hosts' [hostname]='/etc/hostname /etc/hosts'
[bootloader]="/boot/loader/entries/$DIST.conf" # ** based on bootloader [bootloader]="/boot/loader/entries/${DIST,,}.conf" # ** based on bootloader
[locale]='/etc/locale.conf /etc/default/locale' [locale]='/etc/locale.conf /etc/default/locale'
[keyboard]='/etc/X11/xorg.conf.d/00-keyboard.conf /etc/default/keyboard' [keyboard]='/etc/X11/xorg.conf.d/00-keyboard.conf /etc/default/keyboard'
) # } ) # }
@ -905,6 +905,7 @@ select_packages()
qpdfview "A tabbed PDF viewer" "$(ofn qpdfview "${USER_PKGS[*]}")" \ qpdfview "A tabbed PDF viewer" "$(ofn qpdfview "${USER_PKGS[*]}")" \
qt5ct "GUI for managing Qt based application themes, icons, and fonts" "$(ofn qt5ct "${USER_PKGS[*]}")" \ qt5ct "GUI for managing Qt based application themes, icons, and fonts" "$(ofn qt5ct "${USER_PKGS[*]}")" \
qutebrowser "A keyboard-focused vim-like web browser based on Python and PyQt5" "$(ofn qutebrowser "${USER_PKGS[*]}")" \ qutebrowser "A keyboard-focused vim-like web browser based on Python and PyQt5" "$(ofn qutebrowser "${USER_PKGS[*]}")" \
ranger "A simple vim-like file manager" "$(ofn ranger "${USER_PKGS[*]}")" \
rhythmbox "A Music playback and management application" "$(ofn rhythmbox "${USER_PKGS[*]}")" \ rhythmbox "A Music playback and management application" "$(ofn rhythmbox "${USER_PKGS[*]}")" \
rsync "A file transfer program to keep remote files in sync" "$(ofn rsync "${USER_PKGS[*]}")" \ rsync "A file transfer program to keep remote files in sync" "$(ofn rsync "${USER_PKGS[*]}")" \
rxvt-unicode "A unicode enabled rxvt-clone terminal emulator" "$(ofn rxvt-unicode "${USER_PKGS[*]}")" \ rxvt-unicode "A unicode enabled rxvt-clone terminal emulator" "$(ofn rxvt-unicode "${USER_PKGS[*]}")" \
@ -1900,8 +1901,8 @@ install_bootldr()
if [[ $SYS == 'UEFI' ]]; then if [[ $SYS == 'UEFI' ]]; then
# remove our old install and generic BOOT/ dir # remove our old install and generic BOOT/ dir
echo "Removing conflicting boot directories" echo "Removing conflicting boot directories"
if [[ -d "$MNT/boot/EFI/$DIST" ]]; then if [[ -d "$MNT/boot/EFI/${DIST,,}" ]]; then
find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname "$DIST" -type d -delete -printf "remove %p\n" find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname "${DIST,,}" -type d -delete -printf "remove %p\n"
find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete -printf "remove %p\n" find "$MNT/boot/EFI/" -maxdepth 1 -mindepth 1 -iname 'BOOT' -type d -delete -printf "remove %p\n"
fi fi
fi fi
@ -1941,7 +1942,7 @@ install_bootldr()
mkdir -pv "$MNT/boot/EFI/BOOT" mkdir -pv "$MNT/boot/EFI/BOOT"
case "$BOOTLDR" in case "$BOOTLDR" in
grub) grub)
cp -fv "$MNT/boot/EFI/$DIST/grubx64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" cp -fv "$MNT/boot/EFI/${DIST,,}/grubx64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI"
;; ;;
syslinux) syslinux)
cp -rf "$MNT/boot/EFI/syslinux/"* "$MNT/boot/EFI/BOOT/" cp -rf "$MNT/boot/EFI/syslinux/"* "$MNT/boot/EFI/BOOT/"
@ -2327,7 +2328,7 @@ setup_grub()
BCMDS[grub]="grub-install --verbose --recheck --force --target=i386-pc $BOOT_D" BCMDS[grub]="grub-install --verbose --recheck --force --target=i386-pc $BOOT_D"
else else
BCMDS[grub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1 BCMDS[grub]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
grub-install --verbose --recheck --force --target=x86_64-efi --efi-directory=/boot --bootloader-id='$DIST'" grub-install --verbose --recheck --force --target=x86_64-efi --efi-directory=/boot --bootloader-id='${DIST,,}'"
grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1 grep -q /sys/firmware/efi/efivars /proc/mounts || mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1
fi fi
@ -2398,7 +2399,7 @@ prerun_syslinux()
MENU TITLE $DIST Boot Menu MENU TITLE $DIST Boot Menu
MENU BACKGROUND splash.png MENU BACKGROUND splash.png
TIMEOUT 50 TIMEOUT 50
DEFAULT $DIST DEFAULT ${DIST,,}
# see: https://www.syslinux.org/wiki/index.php/Comboot/menu.c32 # see: https://www.syslinux.org/wiki/index.php/Comboot/menu.c32
MENU WIDTH 78 MENU WIDTH 78
@ -2467,7 +2468,7 @@ prerun_refind-efi()
setup_systemd-boot() setup_systemd-boot()
{ {
EDIT_FILES[bootloader]="/boot/loader/entries/$DIST.conf" EDIT_FILES[bootloader]="/boot/loader/entries/${DIST,,}.conf"
BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; systemd-machine-id-setup && bootctl --path=/boot install" BCMDS[systemd-boot]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; systemd-machine-id-setup && bootctl --path=/boot install"
} }
@ -2476,19 +2477,19 @@ prerun_systemd-boot()
mkdir -pv "$MNT/boot/loader/entries" mkdir -pv "$MNT/boot/loader/entries"
cat > "$MNT/boot/loader/loader.conf" <<- EOF cat > "$MNT/boot/loader/loader.conf" <<- EOF
default $DIST.conf default ${DIST,,}.conf
timeout 5 timeout 5
editor no editor no
EOF EOF
cat > "$MNT/boot/loader/entries/$DIST.conf" <<- EOF cat > "$MNT/boot/loader/entries/${DIST,,}.conf" <<- EOF
title $DIST Linux title $DIST Linux
linux /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd %s" "/$UCODE.img") linux /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd %s" "/$UCODE.img")
initrd /initramfs-$KERNEL.img initrd /initramfs-$KERNEL.img
options root=$ROOT_ID ${LUKS_DEV}${RESUME}rw$([[ $BTRFS_MNT ]] && printf ' %s' "$BTRFS_MNT") options root=$ROOT_ID ${LUKS_DEV}${RESUME}rw$([[ $BTRFS_MNT ]] && printf ' %s' "$BTRFS_MNT")
EOF EOF
cat > "$MNT/boot/loader/entries/$DIST-fallback.conf" <<- EOF cat > "$MNT/boot/loader/entries/${DIST,,}-fallback.conf" <<- EOF
title $DIST Linux Fallback title $DIST Linux Fallback
linux /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd %s" "/$UCODE.img") linux /vmlinuz-${KERNEL}$([[ $UCODE ]] && printf "\ninitrd %s" "/$UCODE.img")
initrd /initramfs-$KERNEL-fallback.img initrd /initramfs-$KERNEL-fallback.img