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

resolve always _KERNEL

Browse source
This commit is contained in:
Tobias Powalowski 2024-07-22 20:40:41 +02:00
parent ff0999e469
commit 1c4c699c6e
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
usr/lib/archboot/release.sh
View file

@ -39,6 +39,7 @@ _create_iso() {
_create_archboot_db "${_W_DIR}${_CACHEDIR}" _create_archboot_db "${_W_DIR}${_CACHEDIR}"
#shellcheck disable=SC1090 #shellcheck disable=SC1090
. "${_W_DIR}/etc/archboot/${_ARCH}.conf" . "${_W_DIR}/etc/archboot/${_ARCH}.conf"
_KERNEL="$(echo ${_KERNEL})"
#shellcheck disable=SC2116,SC2046,SC2027,2086 #shellcheck disable=SC2116,SC2046,SC2027,2086
_ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver ${_W_DIR}/${_KERNEL})" _ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver ${_W_DIR}/${_KERNEL})"
if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then
@ -47,23 +48,27 @@ _create_iso() {
# init ramdisk # init ramdisk
_create_initrd_dir "${_ARCH}-init.conf" _create_initrd_dir "${_ARCH}-init.conf"
. "/etc/archboot/${_ARCH}-init.conf" . "/etc/archboot/${_ARCH}-init.conf"
_KERNEL="$(echo ${_KERNEL})"
_create_cpio "${_W_DIR}/tmp/initrd" "../../init-${_ARCH}.img" _create_cpio "${_W_DIR}/tmp/initrd" "../../init-${_ARCH}.img"
if ! [[ "${_ARCH}" == "riscv64" ]]; then if ! [[ "${_ARCH}" == "riscv64" ]]; then
# local ramdisk # local ramdisk
echo "Generating local initramfs..." echo "Generating local initramfs..."
_create_initrd_dir "${_W_DIR}/tmp/initrd" "${_CONFIG_LOCAL}" _create_initrd_dir "${_W_DIR}/tmp/initrd" "${_CONFIG_LOCAL}"
. "/etc/archboot/${_CONFIG_LOCAL}" . "/etc/archboot/${_CONFIG_LOCAL}"
_KERNEL="$(echo ${_KERNEL})"
_create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-local-${_ARCH}.img" _create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-local-${_ARCH}.img"
# latest ramdisk # latest ramdisk
echo "Generating latest initramfs..." echo "Generating latest initramfs..."
_create_initrd_dir "${_CONFIG_LATEST}" _create_initrd_dir "${_CONFIG_LATEST}"
. "/etc/archboot/${_CONFIG_LATEST}" . "/etc/archboot/${_CONFIG_LATEST}"
_KERNEL="$(echo ${_KERNEL})"
_create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-latest-${_ARCH}.img" _create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-latest-${_ARCH}.img"
fi fi
# normal ramdisk # normal ramdisk
echo "Generating normal initramfs..." echo "Generating normal initramfs..."
_create_initrd_dir "${_ARCH}.conf" _create_initrd_dir "${_ARCH}.conf"
. "/etc/archboot/${_ARCH}.conf" . "/etc/archboot/${_ARCH}.conf"
_KERNEL="$(echo ${_KERNEL})"
_create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-${_ARCH}.img" _create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-${_ARCH}.img"
fi fi
# riscv64 does not support kexec at the moment # riscv64 does not support kexec at the moment