From a344010e687bd72ebdc0803177350d533c8f8b13 Mon Sep 17 00:00:00 2001
From: Helmut Buchsbaum <helmut.buchsbaum@opensource.tttech-industrial.com>
Date: Thu, 5 May 2022 19:25:51 +0200
Subject: [PATCH] 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>
---
 debian/grub/25_linux_acrn |  8 --------
 debian/grub/acrn.cfg      | 21 +++------------------
 2 files changed, 3 insertions(+), 26 deletions(-)

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.