diff --git a/debian/grub/25_linux_acrn b/debian/grub/25_linux_acrn index 8a1fac1fc..be64bd2c4 100755 --- a/debian/grub/25_linux_acrn +++ b/debian/grub/25_linux_acrn @@ -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 /`" diff --git a/debian/grub/acrn.cfg b/debian/grub/acrn.cfg index 4675ee03a..1d8c61bb3 100644 --- a/debian/grub/acrn.cfg +++ b/debian/grub/acrn.cfg @@ -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.