From b5cc3c01994a8a515a5913ed3f4a2899f2febde0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 26 Jul 2023 18:17:27 +0200 Subject: [PATCH] Revert "Enable bootupd integration now that we use unified core" Need changes in Anaconda: ``` org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.common.task.task:Install the bootloader org.fedoraproject.Anaconda.Modules.Storage:DEBUG:anaconda.modules.storage.bootloader.utils:Installing the boot loader. org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.storage.bootloader.utils:boot loader stage1 target device is vda org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.storage.bootloader.utils:boot loader stage2 target device is vda2 org.fedoraproject.Anaconda.Modules.Storage:INFO:anaconda.modules.storage.bootloader.grub2:bootloader.py: used boot args: rhgb quiet org.fedoraproject.Anaconda.Modules.Storage:INFO:program:Running in chroot '/mnt/sysroot'... grub2-editenv - set menu_auto_hide=1 boot_success=1 org.fedoraproject.Anaconda.Modules.Storage:INFO:program:grub2-editenv: error: cannot open `/boot/grub2/grubenv.new': No such file or directory. org.fedoraproject.Anaconda.Modules.Storage:DEBUG:program:Return code: 1 ``` See: https://pagure.io/workstation-ostree-config/pull-request/330 This reverts commit 819da5c8ecf3c707f87ddf5309926fe0160afe76. --- fedora-common-ostree.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index 2a33ff9..9b81f36 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -10,9 +10,11 @@ container-cmd: include: fedora-common-ostree-pkgs.yaml # See https://github.com/coreos/bootupd -arch-include: - x86_64: bootupd.yaml - aarch64: bootupd.yaml +# TODO: Disabled until we use use unified-core or native container flow +# for the main build +# arch-include: +# x86_64: bootupd.yaml +# aarch64: bootupd.yaml packages: # Do not include "full" Git as it brings in Perl