OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

debian: fix broken grub config with grub 2.12 

`version_find_latest` is removed in grub 2.12, replace it with
`sort -V -r` for maximum compatibility.

Tracked-On: #8576
Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com>
Reviewed-by: Junjie Mao <junjie.mao@intel.com>
This commit is contained in:
Jiaqing Zhao 2024-04-12 07:40:13 +00:00 committed by acrnsi-robot
parent 98e546e93d
commit 40d6172247
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/grub/20_acrn-board-inspector vendored
View File

@ -181,7 +181,7 @@ prepare_root_cache=
boot_device_id= boot_device_id=
while [ "x$list" != "x" ] ; do while [ "x$list" != "x" ] ; do
linux=`version_find_latest $list` linux=$(echo ${list} | tr ' ' '\n' | sed -e 's/\.old$/ 1/; / 1$/! s/$/ 2/' | LC_ALL=C sort -V -r | sed -e 's/ 1$/.old/; s/ 2$//' | head -n 1)
case $linux in case $linux in
*.efi.signed) *.efi.signed)
# We handle these in linux_entry. # We handle these in linux_entry.

4
debian/grub/25_linux_acrn vendored
View File

@ -311,7 +311,7 @@ boot_device_id=
acrn_first_entry= acrn_first_entry=
while [ "x${acrn_list}" != "x" ] ; do while [ "x${acrn_list}" != "x" ] ; do
current_acrn=$(version_find_latest $acrn_list) current_acrn=$(echo ${acrn_list} | tr ' ' '\n' | sed -e 's/\.old$/ 1/; / 1$/! s/$/ 2/' | LC_ALL=C sort -V -r | sed -e 's/ 1$/.old/; s/ 2$//' | head -n 1)
acrn_basename=$(basename ${current_acrn}) acrn_basename=$(basename ${current_acrn})
acrn_dirname=$(dirname ${current_acrn}) acrn_dirname=$(dirname ${current_acrn})
rel_acrn_dirname=$(make_system_path_relative_to_its_root $acrn_dirname) rel_acrn_dirname=$(make_system_path_relative_to_its_root $acrn_dirname)
@ -342,7 +342,7 @@ EOF
# only if we have at least one ACRN capable kernel and a Service VM entry defined # only if we have at least one ACRN capable kernel and a Service VM entry defined
while [ "x$list" != "x" ] && [ "x${ACRN_SERVICE_VM_ID}" != "x" ] ; do while [ "x$list" != "x" ] && [ "x${ACRN_SERVICE_VM_ID}" != "x" ] ; do
linux=$(version_find_latest $list) linux=$(echo ${list} | tr ' ' '\n' | sed -e 's/\.old$/ 1/; / 1$/! s/$/ 2/' | LC_ALL=C sort -V -r | sed -e 's/ 1$/.old/; s/ 2$//' | head -n 1)
gettext_printf "Found ACRN linux image: %s\n" "$linux" >&2 gettext_printf "Found ACRN linux image: %s\n" "$linux" >&2
basename=$(basename $linux) basename=$(basename $linux)
dirname=$(dirname $linux) dirname=$(dirname $linux)