From 97ac758de8154f37b9e64b850b21356c6e252d9d Mon Sep 17 00:00:00 2001
From: slowpeek <slowpeek@users.noreply.github.com>
Date: Thu, 27 Jul 2023 18:09:36 +0300
Subject: [PATCH] Use 'source' instead of 'configfile' in generated grub.cfg

Details are outlined in issue #2320
---
 kiwi/bootloader/config/grub2.py           |  4 ++--
 test/unit/bootloader/config/grub2_test.py | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
index 06cd347a1c0..7d168ab6d5e 100644
--- a/kiwi/bootloader/config/grub2.py
+++ b/kiwi/bootloader/config/grub2.py
@@ -1077,7 +1077,7 @@ def _create_early_boot_script_for_uuid_search(self, filename, uuid):
                 )
             )
             early_boot.write(
-                'configfile ($root){0}/{1}/grub.cfg{2}'.format(
+                'source ($root){0}/{1}/grub.cfg{2}'.format(
                     self.get_boot_path(), self.boot_directory_name, os.linesep
                 )
             )
@@ -1098,7 +1098,7 @@ def _create_early_boot_script_for_mbrid_search(self, filename, mbrid):
                 )
             )
             early_boot.write(
-                'configfile ($root)/boot/{0}/grub.cfg{1}'.format(
+                'source ($root)/boot/{0}/grub.cfg{1}'.format(
                     self.boot_directory_name, os.linesep
                 )
             )
diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py
index 03245cb7497..046d20e0d6a 100644
--- a/test/unit/bootloader/config/grub2_test.py
+++ b/test/unit/bootloader/config/grub2_test.py
@@ -1268,7 +1268,7 @@ def side_effect(arg):
                 call('set root="cryptouuid/0815"\n'),
                 call('search --fs-uuid --set=root 0815\n'),
                 call('set prefix=($root)//grub2\n'),
-                call('configfile ($root)//grub2/grub.cfg\n')
+                call('source ($root)//grub2/grub.cfg\n')
             ]
         assert mock_command.call_args_list == [
             call(
@@ -1327,7 +1327,7 @@ def side_effect(arg):
                 call('set root="cryptouuid/0815"\n'),
                 call('search --fs-uuid --set=root 0815\n'),
                 call('set prefix=($root)//grub2\n'),
-                call('configfile ($root)//grub2/grub.cfg\n')
+                call('source ($root)//grub2/grub.cfg\n')
             ]
             mock_open.assert_called_once_with(
                 'root_dir/boot/efi/EFI/BOOT/grub.cfg', 'w'
@@ -1532,7 +1532,7 @@ def side_effect_glob(arg):
                     call('set root="cryptouuid/uuid"\n'),
                     call('search --fs-uuid --set=root uuid\n'),
                     call('set prefix=($root)/boot/grub2\n'),
-                    call('configfile ($root)/boot/grub2/grub.cfg\n')
+                    call('source ($root)/boot/grub2/grub.cfg\n')
                 ]
                 mock_open.assert_called_once_with(
                     'root_dir/boot/efi/EFI/BOOT/grub.cfg', 'w'
@@ -1628,7 +1628,7 @@ def side_effect_glob(arg):
                     call('set root="cryptouuid/uuid"\n'),
                     call('search --fs-uuid --set=root uuid\n'),
                     call('set prefix=($root)/boot/grub2\n'),
-                    call('configfile ($root)/boot/grub2/grub.cfg\n')
+                    call('source ($root)/boot/grub2/grub.cfg\n')
                 ]
                 mock_open.assert_called_once_with(
                     'root_dir/boot/efi/EFI/BOOT/grub.cfg', 'w'
@@ -1730,11 +1730,11 @@ def side_effect(arg):
                 call('set btrfs_relative_path="yes"\n'),
                 call('search --file --set=root /boot/mbrid\n'),
                 call('set prefix=($root)/boot/grub2\n'),
-                call('configfile ($root)/boot/grub2/grub.cfg\n'),
+                call('source ($root)/boot/grub2/grub.cfg\n'),
                 call('set btrfs_relative_path="yes"\n'),
                 call('search --file --set=root /boot/mbrid\n'),
                 call('set prefix=($root)/boot/grub2\n'),
-                call('configfile ($root)/boot/grub2/grub.cfg\n'),
+                call('source ($root)/boot/grub2/grub.cfg\n'),
                 call('source /boot/grub2/grub.cfg\n')
             ]
         assert mock_Path_create.call_args_list == [
@@ -1843,7 +1843,7 @@ def side_effect(arg):
                 call('set btrfs_relative_path="yes"\n'),
                 call('search --file --set=root /boot/mbrid\n'),
                 call('set prefix=($root)/boot/grub2\n'),
-                call('configfile ($root)/boot/grub2/grub.cfg\n'),
+                call('source ($root)/boot/grub2/grub.cfg\n'),
                 call('source /boot/grub2/grub.cfg\n')
             ]
             assert mock_open.call_args_list == [
@@ -1911,7 +1911,7 @@ def side_effect_glob(arg):
                     call('set btrfs_relative_path="yes"\n'),
                     call('search --file --set=root /boot/mbrid\n'),
                     call('set prefix=($root)/boot/grub2\n'),
-                    call('configfile ($root)/boot/grub2/grub.cfg\n'),
+                    call('source ($root)/boot/grub2/grub.cfg\n'),
                     call('source /boot/grub2/grub.cfg\n')
                 ]
                 assert mock_open.call_args_list == [