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

fix _kKVER

Browse source
This commit is contained in:
Tobias Powalowski 2024-07-23 07:24:47 +02:00
parent 931a0203b7
commit c210c24d8f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr/lib/archboot/common.sh
View file

@ -167,7 +167,8 @@ _kver() {
# x86_64: rg -Noazm 1 'ABCDEF\x00+(.*) \(.*@' -r '$1' ${1} # x86_64: rg -Noazm 1 'ABCDEF\x00+(.*) \(.*@' -r '$1' ${1}
# aarch64 compressed and uncompressed: # aarch64 compressed and uncompressed:
# rg -Noazm 1 'Linux version (.*) \(.*@' -r '$1' ${1} # rg -Noazm 1 'Linux version (.*) \(.*@' -r '$1' ${1}
# riscv64: zcat ${1} | rg -Noazm 1 'Linux version (.*) \(.*@' -r '$1' # riscv64, rg cannot handle compression without extension:
# zcat ${1} | rg -Noazm 1 'Linux version (.*) \(.*@' -r '$1'
if [[ -f "${1}" ]]; then if [[ -f "${1}" ]]; then
rg -Noazm 1 'ABCDEF\x00+(.*) \(.*@' -r '$1' "${1}" ||\ rg -Noazm 1 'ABCDEF\x00+(.*) \(.*@' -r '$1' "${1}" ||\
rg -Noazm 1 'Linux version (.*) \(.*@' -r '$1' "${1}" ||\ rg -Noazm 1 'Linux version (.*) \(.*@' -r '$1' "${1}" ||\

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

@ -39,7 +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"
_KVER="$(_kver $(echo ${_W_DIR}/${_KERNEL}))" _KVER="$(_kver $(echo ${_W_DIR}${_KERNEL}))"
#shellcheck disable=SC2116,SC2046,SC2027,2086 #shellcheck disable=SC2116,SC2046,SC2027,2086
_ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-${_KVER}" _ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-${_KVER}"
if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then