mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix _VMLINUZ
This commit is contained in:
parent
30b2910658
commit
1fcacdcf03
2 changed files with 6 additions and 4 deletions
|
@ -209,11 +209,12 @@ _new_environment() {
|
|||
: > "${_W_DIR}"/.archboot
|
||||
_collect_files &
|
||||
_progress_wait "63" "83" "Collecting rootfs files in ${_W_DIR}..." "7"
|
||||
_progress "84" "Moving kernel ${_VMLINUZ} to ${_RAM}/${_VMLINUZ}..."
|
||||
_progress "84" "Moving kernel ${_VMLINUZ} to ${_RAM}/..."
|
||||
# use ramfs to get immediate free space on file deletion
|
||||
mkdir "${_RAM}"
|
||||
mount -t ramfs none "${_RAM}"
|
||||
mv "${_W_DIR}/boot/${_VMLINUZ}" "${_RAM}/"
|
||||
mv "${_W_DIR}${_VMLINUZ}" "${_RAM}/"
|
||||
_VMLINUZ="$(basename ${_VMLINUZ})"
|
||||
_progress "85" "Cleanup ${_W_DIR}..."
|
||||
find "${_W_DIR}"/. -mindepth 1 -maxdepth 1 ! -name 'tmp' -exec rm -rf {} \;
|
||||
_clean_kernel_cache
|
||||
|
|
|
@ -22,8 +22,9 @@ _LOG="/dev/tty11"
|
|||
_NO_LOG="/dev/null"
|
||||
_VC_NUM="$(basename ${_LOG} | sed -e 's#tty##g')"
|
||||
_VC="VC${_VC_NUM}"
|
||||
[[ "${_RUNNING_ARCH}" == "x86_64" || "${_RUNNING_ARCH}" == "riscv64" ]] && _VMLINUZ="vmlinuz-linux"
|
||||
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _VMLINUZ="Image"
|
||||
if [[ "${_RUNNING_ARCH}" == "x86_64" || "${_RUNNING_ARCH}" == "riscv64" ]]; then
|
||||
_VMLINUZ="$(echo /usr/lib/modules/*/vmlinuz)"
|
||||
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _VMLINUZ="/boot/Image"
|
||||
_MENU_TITLE=" Logging to ${_VC} | ${_LOG} "
|
||||
|
||||
_graphic_options() {
|
||||
|
|
Loading…
Reference in a new issue