Compare commits

...

3 commits

Author SHA1 Message Date
Tobias Powalowski
5b2427bbd1 add _RUNNING_ARCH to scripts title 2023-06-29 19:49:08 +02:00
Tobias Powalowski
88573a2ddb add _RUNNING_ARCH to scripts title 2023-06-29 19:40:07 +02:00
Tobias Powalowski
9a6a5fe6ca add - in grub.cfg 2023-06-29 19:34:12 +02:00
5 changed files with 17 additions and 14 deletions

View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
# written by Tobias Powalowski <tpowa@archlinux.org> # written by Tobias Powalowski <tpowa@archlinux.org>
_ANSWER="/tmp/.km" _ANSWER="/tmp/.km"
_TITLE="Archboot | Arch Linux Setup | Console Configuration" _RUNNING_ARCH="$(uname -m)"
_TITLE="Archboot ${_RUNNING_ARCH} | Arch Linux Setup | Console Configuration"
_LIST_MAPS="localectl list-keymaps --no-pager" _LIST_MAPS="localectl list-keymaps --no-pager"
# _dialog() # _dialog()
# an el-cheapo dialog wrapper # an el-cheapo dialog wrapper

View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
# written by Tobias Powalowski <tpowa@archlinux.org> # written by Tobias Powalowski <tpowa@archlinux.org>
_ANSWER="/tmp/.locale" _ANSWER="/tmp/.locale"
_TITLE="Archboot | Arch Linux Setup | System Wide Locale Setting" _RUNNING_ARCH="$(uname -m)"
_TITLE="Archboot${_RUNNING_ARCH} | Arch Linux Setup | System Wide Locale Setting"
# _dialog() # _dialog()
# an el-cheapo dialog wrapper # an el-cheapo dialog wrapper
# #

View file

@ -2,7 +2,8 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
# written by Tobias Powalowski <tpowa@archlinux.org> # written by Tobias Powalowski <tpowa@archlinux.org>
_ANSWER="/tmp/.tz" _ANSWER="/tmp/.tz"
_TITLE="Archboot | Arch Linux Setup | Clock Configuration" _RUNNING_ARCH="$(uname -m)"
_TITLE="Archboot ${_RUNNING_ARCH} | Arch Linux Setup | Clock Configuration"
# _dialog() # _dialog()
# an el-cheapo dialog wrapper # an el-cheapo dialog wrapper
# #

View file

@ -30,12 +30,12 @@ fi
_set_title() { _set_title() {
if [[ "${_DESTDIR}" == "/" ]]; then if [[ "${_DESTDIR}" == "/" ]]; then
_TITLE="Archboot | Arch Linux Setup (System Mode) | https://archboot.com" _TITLE="Archboot ${_RUNNING_ARCH} | Arch Linux Setup (System Mode) | https://archboot.com"
else else
if [[ -e "${_LOCAL_DB}" ]]; then if [[ -e "${_LOCAL_DB}" ]]; then
_TITLE="Archboot | Arch Linux Setup (Local Mode) | https://archboot.com" _TITLE="Archboot ${_RUNNING_ARCH} | Arch Linux Setup (Local Mode) | https://archboot.com"
else else
_TITLE="Archboot | Arch Linux Setup (Online Mode) | https://archboot.com" _TITLE="Archboot ${_RUNNING_ARCH} | Arch Linux Setup (Online Mode) | https://archboot.com"
fi fi
fi fi
} }

View file

@ -61,8 +61,8 @@ function _efi_shell {
} }
if [ ${grub_platform} == "pc" ]; then if [ ${grub_platform} == "pc" ]; then
set default="Archboot Arch Linux X86_64 - BIOS Mode" set default="Archboot - Arch Linux X86_64 - BIOS Mode"
menuentry "Archboot Arch Linux x86_64 - BIOS Mode" { menuentry "Archboot - Arch Linux x86_64 - BIOS Mode" {
_menu_running _menu_running
linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0 linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img
@ -75,23 +75,23 @@ fi
if [ ${grub_platform} == "efi" ]; then if [ ${grub_platform} == "efi" ]; then
if [ ${grub_cpu} == "x86_64" ]; then if [ ${grub_cpu} == "x86_64" ]; then
set default="Archboot Arch Linux x86_64" set default="Archboot - Arch Linux x86_64"
menuentry "Archboot Arch Linux x86_64" { menuentry "Archboot - Arch Linux x86_64" {
_menu_running _menu_running
linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0 linux /boot/vmlinuz-x86_64 console=ttyS0,115200 console=tty0 audit=0
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img
} }
_efi_shell _efi_shell
elif [ ${grub_cpu} == "arm64" ]; then elif [ ${grub_cpu} == "arm64" ]; then
set default="Archboot Arch Linux AA64" set default="Archboot - Arch Linux AA64"
menuentry "Archboot Arch Linux AA64" { menuentry "Archboot - Arch Linux AA64" {
_menu_running _menu_running
linux /boot/Image-aarch64.gz nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4 audit=0 linux /boot/Image-aarch64.gz nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4 audit=0
initrd /boot/amd-ucode.img /boot/init-aarch64.img initrd /boot/amd-ucode.img /boot/init-aarch64.img
} }
elif [ ${grub_cpu} == "i386" ]; then elif [ ${grub_cpu} == "i386" ]; then
set default="Archboot Arch Linux x86_64 - EFI MIXED MODE" set default="Archboot - Arch Linux x86_64 - EFI MIXED MODE"
menuentry "Archboot Arch Linux x86_64 - EFI MIXED MODE" { menuentry "Archboot - Arch Linux x86_64 - EFI MIXED MODE" {
_menu_running _menu_running
linux /boot/vmlinuz-x86_64 _IA32_UEFI=1 console=ttyS0,115200 console=tty0 audit=0 linux /boot/vmlinuz-x86_64 _IA32_UEFI=1 console=ttyS0,115200 console=tty0 audit=0
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/init-x86_64.img