bootloader: Fix up ppc64 bootinfo again

To make the code look pretty extra newline is inserted at the start of bootinfo file. This appears to break boot on Power9 PowerVM LPARs.
OSInside · Sep 12, 2024 · 30e0557 · 30e0557
1 parent 08f6e1b
commit 30e0557
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
@@ -941,13 +941,13 @@ def _setup_chrp_config(self, mbrid):
         chrp_dir = os.path.normpath(os.sep.join([self.boot_dir, 'ppc']))
         Path.create(chrp_dir)
         chrp_bootinfo_file = os.sep.join([chrp_dir, 'bootinfo.txt'])
-        chrp_config = dedent('''
-            <chrp-boot>
-            <description>{os_name}</description>
-            <os-name>{os_name}</os-name>
-            <boot-script>boot &device;:1,\\boot\\grub2\\powerpc-ieee1275\\grub.elf</boot-script>
-            </chrp-boot>
-        ''')
+        chrp_config = dedent(
+            '''<chrp-boot>
+<description>{os_name}</description>
+<os-name>{os_name}</os-name>
+<boot-script>boot &device;:1,\\boot\\grub2\\powerpc-ieee1275\\grub.elf</boot-script>
+</chrp-boot>
+''')
         with open(chrp_bootinfo_file, 'w') as chrp_bootinfo:
             chrp_bootinfo.write(
                 chrp_config.format(os_name=self.get_menu_entry_install_title())

diff --git a/test/data/bootinfo.txt b/test/data/bootinfo.txt
@@ -1,4 +1,3 @@
-
 <chrp-boot>
 <description>Bob</description>
 <os-name>Bob</os-name>