From 70e9c9065b129a5cc5ab2019c33e2994897fa833 Mon Sep 17 00:00:00 2001
From: Renata Ravanelli <rravanel@redhat.com>
Date: Wed, 16 Oct 2024 13:57:06 -0300
Subject: [PATCH] grub.cfg: Remove grub.cfg in bootupd favor

- Bootupd used this file as a reference to generate static GRUB config
  files, the actual grub.cfg installed on the system comes from bootupd;
- Remove grub.cfg since this file is not used here anymore.

Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
---
 src/cosalib/cmdlib.py |  3 --
 src/grub.cfg          | 93 -------------------------------------------
 2 files changed, 96 deletions(-)
 delete mode 100644 src/grub.cfg

diff --git a/src/cosalib/cmdlib.py b/src/cosalib/cmdlib.py
index f25f567fb1..b8fde66cc5 100644
--- a/src/cosalib/cmdlib.py
+++ b/src/cosalib/cmdlib.py
@@ -447,9 +447,6 @@ def generate_image_json(srcfile):
     r = yaml.safe_load(open("/usr/lib/coreos-assembler/image-default.yaml"))
     for k, v in flatten_image_yaml(srcfile).items():
         r[k] = v
-    # Serialize our default GRUB config
-    with open("/usr/lib/coreos-assembler/grub.cfg") as f:
-        r['grub-script'] = f.read()
     return r
 
 
diff --git a/src/grub.cfg b/src/grub.cfg
deleted file mode 100644
index 50db863054..0000000000
--- a/src/grub.cfg
+++ /dev/null
@@ -1,93 +0,0 @@
-# petitboot doesn't support -e and doesn't support an empty path part
-if [ -d (md/md-boot)/grub2 ]; then
-  # fcct currently creates /boot RAID with superblock 1.0, which allows
-  # component partitions to be read directly as filesystems.  This is
-  # necessary because transposefs doesn't yet rerun grub2-install on BIOS,
-  # so GRUB still expects /boot to be a partition on the first disk.
-  #
-  # There are two consequences:
-  # 1. On BIOS and UEFI, the search command might pick an individual RAID
-  #    component, but we want it to use the full RAID in case there are bad
-  #    sectors etc.  The undocumented --hint option is supposed to support
-  #    this sort of override, but it doesn't seem to work, so we set $boot
-  #    directly.
-  # 2. On BIOS, the "normal" module has already been loaded from an
-  #    individual RAID component, and $prefix still points there.  We want
-  #    future module loads to come from the RAID, so we reset $prefix.
-  #    (On UEFI, the stub grub.cfg has already set $prefix properly.)
-  set boot=md/md-boot
-  set prefix=($boot)/grub2
-else
-  if [ -f ${config_directory}/bootuuid.cfg ]; then
-    source ${config_directory}/bootuuid.cfg
-  fi
-  if [ -n "${BOOT_UUID}" ]; then
-    search --fs-uuid "${BOOT_UUID}" --set boot --no-floppy
-  else
-    search --label boot --set boot --no-floppy
-  fi
-fi
-set root=$boot
-
-if [ -f ${config_directory}/grubenv ]; then
-  load_env -f ${config_directory}/grubenv
-elif [ -s $prefix/grubenv ]; then
-  load_env
-fi
-
-if [ x"${feature_menuentry_id}" = xy ]; then
-  menuentry_id_option="--id"
-else
-  menuentry_id_option=""
-fi
-
-function load_video {
-  if [ x$feature_all_video_module = xy ]; then
-    insmod all_video
-  else
-    insmod efi_gop
-    insmod efi_uga
-    insmod ieee1275_fb
-    insmod vbe
-    insmod vga
-    insmod video_bochs
-    insmod video_cirrus
-  fi
-}
-
-# Any non-default console settings will be inserted here.
-# CONSOLE-SETTINGS-START
-# CONSOLE-SETTINGS-END
-
-if [ x$feature_timeout_style = xy ] ; then
-  set timeout_style=menu
-  set timeout=1
-# Fallback normal timeout code in case the timeout_style feature is
-# unavailable.
-else
-  set timeout=1
-fi
-
-# Determine if this is a first boot and set the ${ignition_firstboot} variable
-# which is used in the kernel command line.
-set ignition_firstboot=""
-if [ -f "/ignition.firstboot" ]; then
-    # Default networking parameters to be used with ignition.
-    set ignition_network_kcmdline=''
-
-    # Source in the `ignition.firstboot` file which could override the
-    # above $ignition_network_kcmdline with static networking config.
-    # This override feature is also by coreos-installer to persist static
-    # networking config provided during install to the first boot of the machine.
-    source "/ignition.firstboot"
-
-    set ignition_firstboot="ignition.firstboot ${ignition_network_kcmdline}"
-fi
-
-# Import user defined configuration
-# tracker: https://github.com/coreos/fedora-coreos-tracker/issues/805
-if [ -f $prefix/user.cfg ]; then
-  source $prefix/user.cfg
-fi
-
-blscfg