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

debian/grub: Remove override variable support 

The support for

  GRUB_CMDLINE_LINUX_ACRN_REPLACE_DEFAULT
  GRUB_CMDLINE_LINUX_ACRN_REPLACE

to override kernel parameter settings when booting ACRN Service VM has been
discontinued in favor of setting the kernel parameters in the scenario
configuration properly.

Tracked-On: #6688
Signed-off-by: Helmut Buchsbaum <helmut.buchsbaum@opensource.tttech-industrial.com>
This commit is contained in:
Helmut Buchsbaum 2022-05-05 19:25:51 +02:00 committed by acrnsi-robot
parent a75ac7e77f
commit a344010e68
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/grub/25_linux_acrn vendored
View File

@ -93,14 +93,6 @@ else
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
fi
# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT.
if [ "${GRUB_CMDLINE_LINUX_ACRN_REPLACE}" ]; then
GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_ACRN_REPLACE}"
fi
if [ "${GRUB_CMDLINE_LINUX_ACRN_REPLACE_DEFAULT}" ]; then
GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_ACRN_REPLACE_DEFAULT}"
fi
case x"$GRUB_FS" in
xbtrfs)
rootsubvol="`make_system_path_relative_to_its_root /`"

21
debian/grub/acrn.cfg vendored
View File

@ -1,21 +1,6 @@
# When running update-grub with the ACRN hypervisor installed, there are
# some additional variables that can be used to pass options to the
# hypervisor or the SOS kernel.
#
# The configuration in here makes it possible to have different options set
# for the linux kernel when booting with or without ACRN.
echo "Including ACRN overrides from /etc/default/grub.d/acrn.cfg"
#######################################################################
# SOS Kernel Command Line Options
#
# The next options are used for creating additional kernel arguments for
# SOS kernel. ACRN already has built-in parameters so be careful
# in what you add!
#
#GRUB_CMDLINE_LINUX_ACRN_REPLACE_DEFAULT=""
#GRUB_CMDLINE_LINUX_ACRN_REPLACE=""
# No override variables here any more. To add any custom kernel parameters
# for ACRN Service VM boot, please adapt your scenario configuration
# accordingly!
# Make booting into ACRN the default. Set the following variable to 0 or 1
# explicitly to avoid the message warning from being printed.