mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
fix _kKVER
This commit is contained in:
parent
931a0203b7
commit
c210c24d8f
2 changed files with 3 additions and 2 deletions
|
@ -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}" ||\
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue