Skip to content

Commit a78968a

Browse files
jiaqingz-devjsun26intel
authored andcommitted
grub-acrn: read scenario config from /usr/share/acrn/scenario.xml
Calling debconfig to concatenating the path of scenario xml may fail when executing update-grub during package installation as debconf database might be locked by dpkg. Read scenario config from /usr/share/acrn/scenario.xml (symlink created when installing acrn-hypervisor) instead. Tracked-On: #8667 Signed-off-by: Jiaqing Zhao <[email protected]> Reviewed-by: Junjie Mao <[email protected]>
1 parent 8605089 commit a78968a

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

debian/grub/25_linux_acrn

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,8 @@ datarootdir="/usr/share"
2525

2626
CLASS="--class gnu-linux --class gnu --class os --class acrn"
2727

28-
# read ACRN config (board/scenario) from debconf
29-
ACRN_BOARD=$(echo "get acrn-hypervisor/board" | debconf-communicate || true)
30-
if [ "$(echo "${ACRN_BOARD}" | awk '{print $1}')" != "0" ]; then
31-
gettext_printf "ACRN: Cannot access debconf acrn-hypervisor/board: %s" "${ACRN_BOARD}\n" >&2
32-
exit 0
33-
fi
34-
ACRN_BOARD="$(echo "${ACRN_BOARD}" | awk '{print $2}')"
35-
36-
ACRN_SCENARIO=$(echo "get acrn-hypervisor/scenario" | debconf-communicate || true)
37-
if [ "$(echo "${ACRN_SCENARIO}" | awk '{print $1}')" != "0" ]; then
38-
gettext_printf "ACRN: Cannot access debconf acrn-hypervisor/:scenario %s" "${ACRN_SCENARIO}\n" >&2
39-
exit 0
40-
fi
41-
ACRN_SCENARIO="$(echo "${ACRN_SCENARIO}" | awk '{print $2}')"
42-
4328
# we obtain any data from scenario config
44-
ACRN_SCENARIO_FILE=/usr/lib/x86_64-linux-gnu/acrn/${ACRN_BOARD}/${ACRN_SCENARIO}/scenario.xml
29+
ACRN_SCENARIO_FILE=/usr/share/acrn/scenario.xml
4530
if [ ! -f ${ACRN_SCENARIO_FILE} ]; then
4631
gettext_printf "ACRN: Missing scenario config %s\n" "${ACRN_SCENARIO_FILE}" >&2
4732
exit 0
@@ -376,7 +361,7 @@ EOF
376361
gettext_printf "Found ACRN initrd image: %s\n" "${dirname}/${initrd}" >&2
377362
fi
378363
else
379-
gettext_printf "ACRN: No initrd image for ${ACRN_BOARD}:${ACRN_SCENARIO}\n" >&2
364+
gettext_printf "ACRN: No initrd image found for %s\n" "${linux}" >&2
380365
# "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here.
381366
linux_root_device_thisversion=${GRUB_DEVICE}
382367
fi

0 commit comments

Comments
 (0)