root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

rename parameters

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-07 21:43:18 +01:00
parent b5b373498f
commit 241d1ebbaf
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/installer/base.sh
View file

@ -23,7 +23,7 @@ _S_MKFSAUTO=0 # auto fs part/formatting
# menu item tracker- autoselect the next item
_NEXTITEM=""
# To allow choice in script set EDITOR=""
EDITOR=""
_EDITOR=""
set_title() {
if [[ -e "${LOCAL_DB}" ]]; then
@ -55,7 +55,7 @@ printk()
# prompts the user to choose an editor
# sets EDITOR global variable
geteditor() {
if ! [[ "${EDITOR}" ]]; then
if ! [[ "${_EDITOR}" ]]; then
DIALOG --menu "Select a Text Editor to Use" 9 35 3 \
"1" "nano (easier)" \
"2" "neovim" 2>${_ANSWER} || return 1

8
usr/lib/archboot/installer/bootloader.sh
View file

@ -459,8 +459,8 @@ GUMEOF
"${_DESTDIR}/${UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
DIALOG --msgbox "You will now be put into the editor to edit:\nloader.conf and menu entry files\n\nAfter you save your changes, exit the editor." 8 50
geteditor || return 1
"${EDITOR}" "${_DESTDIR}/${UEFISYS_MP}/loader/entries/archlinux-core-main.conf"
"${EDITOR}" "${_DESTDIR}/${UEFISYS_MP}/loader/loader.conf"
"${_EDITOR}" "${_DESTDIR}/${UEFISYS_MP}/loader/entries/archlinux-core-main.conf"
"${_EDITOR}" "${_DESTDIR}/${UEFISYS_MP}/loader/loader.conf"
DIALOG --infobox "SYSTEMD-BOOT has been setup successfully.\nContinuing in 5 seconds ..." 4 50
sleep 5
S_BOOTLOADER="1"
@ -509,7 +509,7 @@ CONFEOF
cp -f "${_DESTDIR}/${UEFISYS_MP}/EFI/refind/refind_${_SPEC_UEFI_ARCH}.efi" "${_DESTDIR}/${UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
DIALOG --msgbox "You will now be put into the editor to edit:\nrefind.conf\n\nAfter you save your changes, exit the editor." 8 50
geteditor || return 1
"${EDITOR}" "${_REFIND_CONFIG}"
"${_EDITOR}" "${_REFIND_CONFIG}"
cp -f "${_REFIND_CONFIG}" "${_DESTDIR}/${UEFISYS_MP}/EFI/BOOT/"
DIALOG --infobox "rEFInd has been setup successfully.\nContinuing in 5 seconds ..." 4 50
sleep 5
@ -738,7 +738,7 @@ fi
## Edit grub.cfg config file
DIALOG --msgbox "You must now review the GRUB(2) configuration file.\n\nYou will now be put into the editor.\nAfter you save your changes, exit the editor." 8 55
geteditor || return 1
"${EDITOR}" "${_DESTDIR}/${GRUB_PREFIX_DIR}/${GRUB_CFG}"
"${_EDITOR}" "${_DESTDIR}/${GRUB_PREFIX_DIR}/${GRUB_CFG}"
}
do_uboot() {

2
usr/lib/archboot/installer/configuration.sh
View file

@ -16,7 +16,7 @@ check_root_password() {
set_mkinitcpio() {
DIALOG --msgbox "The mkinitcpio.conf file controls which modules will be placed into the initramfs for your system's kernel.\n\n- If you install under VMWARE add 'BusLogic' to MODULES= array\n- 2 or more disk controllers, please specify the correct module\n loading order in MODULES= array \n\nMost of you will not need to change anything in this file." 12 70
HOOK_ERROR=""
${EDITOR} "${_DESTDIR}""${FILE}"
${_EDITOR} "${_DESTDIR}""${FILE}"
#shellcheck disable=SC2013
for i in $(grep ^HOOKS "${_DESTDIR}"/etc/mkinitcpio.conf | sed -e 's/"//g' -e 's/HOOKS=\(//g' -e 's/\)//g'); do
[[ -e ${_DESTDIR}/usr/lib/initcpio/install/${i} ]] || HOOK_ERROR=1