This commit is contained in:
parent
1d5cf86bfa
commit
a9fae378a3
2
.gitignore
vendored
2
.gitignore
vendored
@ -27,3 +27,5 @@
|
|||||||
/bootupd-0.2.12-vendor.tar.zstd
|
/bootupd-0.2.12-vendor.tar.zstd
|
||||||
/bootupd-0.2.13.crate
|
/bootupd-0.2.13.crate
|
||||||
/bootupd-0.2.13-vendor.tar.zstd
|
/bootupd-0.2.13-vendor.tar.zstd
|
||||||
|
/bootupd-0.2.14.crate
|
||||||
|
/bootupd-0.2.14-vendor.tar.zstd
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
From ece9120cb43b1834ff4b7268308886cd89a47e54 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Colin Walters <walters@verbum.org>
|
|
||||||
Date: Thu, 9 Nov 2023 19:17:57 -0500
|
|
||||||
Subject: [PATCH] grubconfigs: Ensure grub2 dir exists
|
|
||||||
|
|
||||||
I hit this when testing `bootc install` in a loop, it seems like
|
|
||||||
we could be implicitly depending on this directory already
|
|
||||||
having been created.
|
|
||||||
---
|
|
||||||
src/grubconfigs.rs | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/grubconfigs.rs b/src/grubconfigs.rs
|
|
||||||
index 01f6b3e..dcdf986 100644
|
|
||||||
--- a/src/grubconfigs.rs
|
|
||||||
+++ b/src/grubconfigs.rs
|
|
||||||
@@ -62,6 +62,10 @@ pub(crate) fn install(target_root: &openat::Dir, efi: bool) -> Result<()> {
|
|
||||||
config.push_str(post.as_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
+ if !bootdir.exists(GRUB2DIR)? {
|
|
||||||
+ bootdir.create_dir(GRUB2DIR, 0o700)?;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
bootdir
|
|
||||||
.write_file_contents(format!("{GRUB2DIR}/grub.cfg"), 0o644, config.as_bytes())
|
|
||||||
.context("Copying grub-static.cfg")?;
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
@ -3,8 +3,8 @@
|
|||||||
%global crate bootupd
|
%global crate bootupd
|
||||||
|
|
||||||
Name: rust-%{crate}
|
Name: rust-%{crate}
|
||||||
Version: 0.2.13
|
Version: 0.2.14
|
||||||
Release: 4%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Bootloader updater
|
Summary: Bootloader updater
|
||||||
|
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -12,8 +12,6 @@ URL: https://github.com/coreos/bootupd
|
|||||||
Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate
|
Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate
|
||||||
Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
|
Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
|
||||||
|
|
||||||
Patch0: 0001-grubconfigs-Ensure-grub2-dir-exists.patch
|
|
||||||
|
|
||||||
# For now, see upstream
|
# For now, see upstream
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
@ -85,6 +83,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
|
|||||||
%systemd_postun bootupd.service bootupd.socket
|
%systemd_postun bootupd.service bootupd.socket
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 20 2023 Colin Walters <walters@verbum.org> - 0.2.14-2
|
||||||
|
- https://github.com/coreos/bootupd/releases/tag/v0.2.14
|
||||||
|
|
||||||
* Tue Nov 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.2.13-4
|
* Tue Nov 14 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.2.13-4
|
||||||
- Fix RHEL build
|
- Fix RHEL build
|
||||||
|
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (bootupd-0.2.13.crate) = 90986c102b9e0977e8d2d6141063e3f33b7b1ef732971703e01a03cf9a7cc20b295f969f84495e74e2594c501c95fb5b85d6cbc76c568871dfa765f1ed7fce0d
|
SHA512 (bootupd-0.2.14.crate) = bb4051a53368d18b6a1428c5d617306520a0f222dd75f6f41762fb8187ded68b850ca7d1e9e6811f4544beba3ad3157aba6b402ca500ed56b3f54e4225f68f9d
|
||||||
SHA512 (bootupd-0.2.13-vendor.tar.zstd) = 76a6ee84374b68ca53fe44b6df2c07870045311d1ae6a01301c97e92753d407d2dc3b085ebdb502bafcc2206162262bb0268b1c8a48cc8582d666d031acc53da
|
SHA512 (bootupd-0.2.14-vendor.tar.zstd) = 8b7f0c5894667e44a4975fd33a914d183b173e2682cb9e24e902ee7094be6cbffc3a6e29c74f7f0e5873f1ebce3330b93e0ac2fa186f1b26c7324ccb2a9f80f1
|
||||||
|
Loading…
Reference in New Issue
Block a user